Hanno Böck commited on 2007-08-22 06:06:55
              Zeige 19 geänderte Dateien mit 0 Einfügungen und 1612 Löschungen.
            
| ... | ... | 
                      @@ -1,74 +0,0 @@  | 
                  
| 1 | 
                        -AUX README.Gentoo 984 RMD160 cbaac3ea99a614c2155baad18a0a364a33d01ca1 SHA1 9a8c71a0499ccf46aa80d4b54b3e16066dd74caa SHA256 cb495c86769e5de3d070b98ba379f3a1d83936c3c509263bca34f2fdd78f3726  | 
                    |
| 2 | 
                        -MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984  | 
                    |
| 3 | 
                        -RMD160 cbaac3ea99a614c2155baad18a0a364a33d01ca1 files/README.Gentoo 984  | 
                    |
| 4 | 
                        -SHA256 cb495c86769e5de3d070b98ba379f3a1d83936c3c509263bca34f2fdd78f3726 files/README.Gentoo 984  | 
                    |
| 5 | 
                        -AUX jabber-conf.d 525 RMD160 0a1a0afdaf445d8202b86d009d02752ce07a8111 SHA1 85c3d9970bbd3594b436a751928633549b4e1568 SHA256 63d86ba061bee5bd8777b6b5f5c558dc70af03999b10ca45b583cbc69eb68a0a  | 
                    |
| 6 | 
                        -MD5 3a5219d7870e60f5b16d6aefb1c63a0e files/jabber-conf.d 525  | 
                    |
| 7 | 
                        -RMD160 0a1a0afdaf445d8202b86d009d02752ce07a8111 files/jabber-conf.d 525  | 
                    |
| 8 | 
                        -SHA256 63d86ba061bee5bd8777b6b5f5c558dc70af03999b10ca45b583cbc69eb68a0a files/jabber-conf.d 525  | 
                    |
| 9 | 
                        -AUX jabber.init.bundled 626 RMD160 fcb220de2879550fa91cb3cfce7b45e818e2972b SHA1 ff3003732af409e44b21f80defa3a2a939c8ad4d SHA256 55cbd339b6c4112aeade836b363d62abe1f5e99f70bfc2d8dbc9dcc944378d61  | 
                    |
| 10 | 
                        -MD5 3d8c2953acd251416c2fdb9a721b9e52 files/jabber.init.bundled 626  | 
                    |
| 11 | 
                        -RMD160 fcb220de2879550fa91cb3cfce7b45e818e2972b files/jabber.init.bundled 626  | 
                    |
| 12 | 
                        -SHA256 55cbd339b6c4112aeade836b363d62abe1f5e99f70bfc2d8dbc9dcc944378d61 files/jabber.init.bundled 626  | 
                    |
| 13 | 
                        -AUX jabber.init.gentoo 2118 RMD160 c363c6cccd9671d6fb8484aebb4659665e51f138 SHA1 2c63fd57aab7039da188052772d2eec4035a0980 SHA256 636e1432955b6a09f2f6ceba8cd4a223a8e1840b4082e3615424cfeca4c93e51  | 
                    |
| 14 | 
                        -MD5 1813a30dabb60fa0a15ee3ed3aaad28d files/jabber.init.gentoo 2118  | 
                    |
| 15 | 
                        -RMD160 c363c6cccd9671d6fb8484aebb4659665e51f138 files/jabber.init.gentoo 2118  | 
                    |
| 16 | 
                        -SHA256 636e1432955b6a09f2f6ceba8cd4a223a8e1840b4082e3615424cfeca4c93e51 files/jabber.init.gentoo 2118  | 
                    |
| 17 | 
                        -AUX jabber.rc6-r5 874 RMD160 a5cc38b73d707f4cc6a74f6658d93987471ce2e9 SHA1 7d77b306d6eed609bd78357a1687b32f8658477e SHA256 2a5b6f0e0045e1b0a179f45acf6dfdda3eafb07e9626c59ab9694091ad0059be  | 
                    |
| 18 | 
                        -MD5 8d4ca5fb6338d837674ab33c8f969273 files/jabber.rc6-r5 874  | 
                    |
| 19 | 
                        -RMD160 a5cc38b73d707f4cc6a74f6658d93987471ce2e9 files/jabber.rc6-r5 874  | 
                    |
| 20 | 
                        -SHA256 2a5b6f0e0045e1b0a179f45acf6dfdda3eafb07e9626c59ab9694091ad0059be files/jabber.rc6-r5 874  | 
                    |
| 21 | 
                        -AUX jabber.rc6-r6 953 RMD160 2165b3119893f51e777b27972bc755c6390ac58f SHA1 0a2f2867683b3b42e205b9dc8452888620000508 SHA256 03301c94ee862ffa7c31a9995ef9e3557f415fb299fad8a398f0d27588780712  | 
                    |
| 22 | 
                        -MD5 6912454f1d1d480cbb711f715292e3cc files/jabber.rc6-r6 953  | 
                    |
| 23 | 
                        -RMD160 2165b3119893f51e777b27972bc755c6390ac58f files/jabber.rc6-r6 953  | 
                    |
| 24 | 
                        -SHA256 03301c94ee862ffa7c31a9995ef9e3557f415fb299fad8a398f0d27588780712 files/jabber.rc6-r6 953  | 
                    |
| 25 | 
                        -AUX jabber.rc6-r7 1842 RMD160 115b8e998e8cbab50a35e6450cde9ffee2d84077 SHA1 130c989bb57c8c8f7d1531142ddd998e449440ad SHA256 d3fabcb90f65271a2fb5afc7384e6bbc45d55d17a0e208a011e682feeb00a624  | 
                    |
| 26 | 
                        -MD5 4ea516e4527dd2de19281709704238ee files/jabber.rc6-r7 1842  | 
                    |
| 27 | 
                        -RMD160 115b8e998e8cbab50a35e6450cde9ffee2d84077 files/jabber.rc6-r7 1842  | 
                    |
| 28 | 
                        -SHA256 d3fabcb90f65271a2fb5afc7384e6bbc45d55d17a0e208a011e682feeb00a624 files/jabber.rc6-r7 1842  | 
                    |
| 29 | 
                        -AUX jabber.rc6-r8 800 RMD160 99fe1b8af7a4293af04b08c4b32b77173a46c7f1 SHA1 fe427cf1df5cc93e7f7b7d5792b841d54fac2ec2 SHA256 1ee99a10af00a518cfd74fa0279fcb7937d00f4d24633b67ea6974a19e2a505a  | 
                    |
| 30 | 
                        -MD5 078528dc08a082b7a0534d4f6c5c5f5e files/jabber.rc6-r8 800  | 
                    |
| 31 | 
                        -RMD160 99fe1b8af7a4293af04b08c4b32b77173a46c7f1 files/jabber.rc6-r8 800  | 
                    |
| 32 | 
                        -SHA256 1ee99a10af00a518cfd74fa0279fcb7937d00f4d24633b67ea6974a19e2a505a files/jabber.rc6-r8 800  | 
                    |
| 33 | 
                        -AUX multiple-xml-patch-00 5934 RMD160 89554e2f3f3354ecc248324bcb2a8b9151ebc67d SHA1 27f0aab6b2ec468dd9a1d3b7633555db83ade23f SHA256 43287b8265631498e0e82dfd0b362ec2513ffc4f3ea4daf112a52f3be49795c7  | 
                    |
| 34 | 
                        -MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934  | 
                    |
| 35 | 
                        -RMD160 89554e2f3f3354ecc248324bcb2a8b9151ebc67d files/multiple-xml-patch-00 5934  | 
                    |
| 36 | 
                        -SHA256 43287b8265631498e0e82dfd0b362ec2513ffc4f3ea4daf112a52f3be49795c7 files/multiple-xml-patch-00 5934  | 
                    |
| 37 | 
                        -AUX multiple-xml-patch-01 303 RMD160 94a3d484e157f59f04ac2c7e5edf1d92eecd9edd SHA1 6db80faa5a9ea9dea767665866baa3c6d27b4b9d SHA256 9354ea516986fff0de1a1745a33323d5717753a1ef6a19a166da251faa2532a5  | 
                    |
| 38 | 
                        -MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303  | 
                    |
| 39 | 
                        -RMD160 94a3d484e157f59f04ac2c7e5edf1d92eecd9edd files/multiple-xml-patch-01 303  | 
                    |
| 40 | 
                        -SHA256 9354ea516986fff0de1a1745a33323d5717753a1ef6a19a166da251faa2532a5 files/multiple-xml-patch-01 303  | 
                    |
| 41 | 
                        -AUX multiple.xml 15387 RMD160 c2eb6c555adb1560426dc2f407b4044735a19ee8 SHA1 848fe2149daf363fd1c142fbde6fb7f625de9700 SHA256 4dc1cd47d7fd8157680cb67d5b0265f41dc225cf5717cd556d755d2ecab0ed9e  | 
                    |
| 42 | 
                        -MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387  | 
                    |
| 43 | 
                        -RMD160 c2eb6c555adb1560426dc2f407b4044735a19ee8 files/multiple.xml 15387  | 
                    |
| 44 | 
                        -SHA256 4dc1cd47d7fd8157680cb67d5b0265f41dc225cf5717cd556d755d2ecab0ed9e files/multiple.xml 15387  | 
                    |
| 45 | 
                        -AUX patch-c2s-buffers 12112 RMD160 53b67e0c890d4939e92ea929d2daa589d0af4985 SHA1 bc66b98f81d23d2314b5515cf2191be38985afaf SHA256 c9a2bfb0874aa335044ec79e5d1c1ae7ad929c6889e780976e114de223f2ecab  | 
                    |
| 46 | 
                        -MD5 40ed7d521eda61aa9f67390099e5b693 files/patch-c2s-buffers 12112  | 
                    |
| 47 | 
                        -RMD160 53b67e0c890d4939e92ea929d2daa589d0af4985 files/patch-c2s-buffers 12112  | 
                    |
| 48 | 
                        -SHA256 c9a2bfb0874aa335044ec79e5d1c1ae7ad929c6889e780976e114de223f2ecab files/patch-c2s-buffers 12112  | 
                    |
| 49 | 
                        -AUX self-cert.jabberd-2.sh 688 RMD160 bdf07df3eac44c121947a2b53797bf38002aac2c SHA1 00422b0720f09a42bc92fac18f9eb022c8e86e2d SHA256 2b7bd52854a4dabc0ff08ac0c72c3f0c0355bf84d751fe2a266d3e987890089d  | 
                    |
| 50 | 
                        -MD5 1d08c47f5fe30ced5227f28bac65f6fd files/self-cert.jabberd-2.sh 688  | 
                    |
| 51 | 
                        -RMD160 bdf07df3eac44c121947a2b53797bf38002aac2c files/self-cert.jabberd-2.sh 688  | 
                    |
| 52 | 
                        -SHA256 2b7bd52854a4dabc0ff08ac0c72c3f0c0355bf84d751fe2a266d3e987890089d files/self-cert.jabberd-2.sh 688  | 
                    |
| 53 | 
                        -AUX self-cert.sh 494 RMD160 f9af6ce9cf396b6ae2697f66120060433514051a SHA1 6fd88c8368291d293dd8fb901305ae8cfae7dde0 SHA256 060756f5e3660d9e5c37f4c34e895b88a371c76fc1095ab49853e151c190e9b4  | 
                    |
| 54 | 
                        -MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494  | 
                    |
| 55 | 
                        -RMD160 f9af6ce9cf396b6ae2697f66120060433514051a files/self-cert.sh 494  | 
                    |
| 56 | 
                        -SHA256 060756f5e3660d9e5c37f4c34e895b88a371c76fc1095ab49853e151c190e9b4 files/self-cert.sh 494  | 
                    |
| 57 | 
                        -AUX xdb-ldap.xml 985 RMD160 1fef53144712c90a1a8331f2dd33dde67e96d4da SHA1 0da96bd4d285e225714470ba254be44025fdde5e SHA256 b120ded22102e2f21f557c6da7914ca4174272a51b9ae48e9fb950bb529c4e32  | 
                    |
| 58 | 
                        -MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985  | 
                    |
| 59 | 
                        -RMD160 1fef53144712c90a1a8331f2dd33dde67e96d4da files/xdb-ldap.xml 985  | 
                    |
| 60 | 
                        -SHA256 b120ded22102e2f21f557c6da7914ca4174272a51b9ae48e9fb950bb529c4e32 files/xdb-ldap.xml 985  | 
                    |
| 61 | 
                        -AUX xml-stream-patch-00 726 RMD160 52bd65c728666be7f6ad48508748d1a4f0b47f3a SHA1 ec391341dd818bbdc9bc7f9c72e5d77934565b96 SHA256 c6b447658281c5136b63cc2bdcd1d38463dae57a0dc701b7d90fecacc409f0c4  | 
                    |
| 62 | 
                        -MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726  | 
                    |
| 63 | 
                        -RMD160 52bd65c728666be7f6ad48508748d1a4f0b47f3a files/xml-stream-patch-00 726  | 
                    |
| 64 | 
                        -SHA256 c6b447658281c5136b63cc2bdcd1d38463dae57a0dc701b7d90fecacc409f0c4 files/xml-stream-patch-00 726  | 
                    |
| 65 | 
                        -DIST jabberd-1.4.3-extexpat.diff 309514 RMD160 93000ff5aa882a48ac55d45dc51d01405d7cafdc SHA1 d06d53032634cc6a508e51e92a8943fab177e67c SHA256 436a1b7b11b157794027940fd9ae474474ebdf0d6ba16b799016a689682650b7  | 
                    |
| 66 | 
                        -DIST jabberd-1.4.3.tar.gz 258016 RMD160 a87bede7d76d6601d8b2986dca8d882401ba1a85 SHA1 cf968017c8a4f2d0dc3c139c712846a722d9bbed SHA256 aad60b39ebe9121a857e51ea226964ad5a21babff8ccb99cb25d6a45e96e1f57  | 
                    |
| 67 | 
                        -DIST xdb_ldap-1.0.tar.gz 112204 RMD160 2b8722d8990944105dacd4a73bc45c24a72ccdfa SHA1 e2f8110b77031a2ce751ffa300768794c36d91fb SHA256 fdcdc9b65a40aff8ca38ad27fad701d7692f0976eb6344f5deae317d00d0c5bd  | 
                    |
| 68 | 
                        -EBUILD jabberd-1.4.3-r5.ebuild 5585 RMD160 bc32a63f8e1f852000e2fa98ec0a5dbe44526f12 SHA1 89a4cf8220bbc444299614ab4b286b7b95b75247 SHA256 879a603945b764612682dfc73525a8d2db5d05109902f48f8ebdf867c92b6f93  | 
                    |
| 69 | 
                        -MD5 fd3ce7d740d8450e25a42372fae1ded5 jabberd-1.4.3-r5.ebuild 5585  | 
                    |
| 70 | 
                        -RMD160 bc32a63f8e1f852000e2fa98ec0a5dbe44526f12 jabberd-1.4.3-r5.ebuild 5585  | 
                    |
| 71 | 
                        -SHA256 879a603945b764612682dfc73525a8d2db5d05109902f48f8ebdf867c92b6f93 jabberd-1.4.3-r5.ebuild 5585  | 
                    |
| 72 | 
                        -MD5 9e3234e4f869fa8ac1e504bd23c4c9ce files/digest-jabberd-1.4.3-r5 741  | 
                    |
| 73 | 
                        -RMD160 faa064a50b8c611bb985a5211b4098c89aad67eb files/digest-jabberd-1.4.3-r5 741  | 
                    |
| 74 | 
                        -SHA256 4eb60913cb6143f37c2c3c2f7536e97876c8f786e48943a5cc6fb97fd2016198 files/digest-jabberd-1.4.3-r5 741  | 
                    
| ... | ... | 
                      @@ -1,26 +0,0 @@  | 
                  
| 1 | 
                        -This instructions are valid if you are using jabberd14 as the main server. If  | 
                    |
| 2 | 
                        -you are going to use jabberd2 you must edit /etc/confd/jabberd and change  | 
                    |
| 3 | 
                        -jabberd14 to jabberd2.  | 
                    |
| 4 | 
                        -  | 
                    |
| 5 | 
                        -This is a small help to get you started with Jabber in Gentoo.  | 
                    |
| 6 | 
                        -Edit /etc/jabber/multiple.xml . This is the main jabber server config file.  | 
                    |
| 7 | 
                        -There change all references to localhost with the FQDN (Fully Qualified Domain  | 
                    |
| 8 | 
                        -Name) for your server.  | 
                    |
| 9 | 
                        -If you are going to use SSL you must change the line:  | 
                    |
| 10 | 
                        - <ssl port="5223"/> <!-- 10.1.2.3</ssl> -->  | 
                    |
| 11 | 
                        -To:  | 
                    |
| 12 | 
                        -<ssl port="5223">10.1.2.3</ssl>  | 
                    |
| 13 | 
                        -Where 10.1.2.3 is your machines IP (not name, IP here).  | 
                    |
| 14 | 
                        -Also, edit:  | 
                    |
| 15 | 
                        -<ssl>  | 
                    |
| 16 | 
                        - <key ip="10.1.2.3">/etc/jabber/gentoo.pem</key>  | 
                    |
| 17 | 
                        -</ssl>  | 
                    |
| 18 | 
                        -  | 
                    |
| 19 | 
                        -at the end of the file to your IP.  | 
                    |
| 20 | 
                        -  | 
                    |
| 21 | 
                        -You can now test your setup with the command:  | 
                    |
| 22 | 
                        -jabberd -c /etc/jabber/multiple.xml -D  | 
                    |
| 23 | 
                        -  | 
                    |
| 24 | 
                        -And try to connect to your new server with a jabber client. If all goes well  | 
                    |
| 25 | 
                        -kill your jabber server (control-c) and if you have installed transports go  | 
                    |
| 26 | 
                        -configure them now.  | 
                    
| ... | ... | 
                      @@ -1,9 +0,0 @@  | 
                  
| 1 | 
                        -MD5 293c77245963b21e73f17fbde4aec200 jabberd-1.4.3-extexpat.diff 309514  | 
                    |
| 2 | 
                        -RMD160 93000ff5aa882a48ac55d45dc51d01405d7cafdc jabberd-1.4.3-extexpat.diff 309514  | 
                    |
| 3 | 
                        -SHA256 436a1b7b11b157794027940fd9ae474474ebdf0d6ba16b799016a689682650b7 jabberd-1.4.3-extexpat.diff 309514  | 
                    |
| 4 | 
                        -MD5 a3e964d6fa07b5d850302ae0512f94c6 jabberd-1.4.3.tar.gz 258016  | 
                    |
| 5 | 
                        -RMD160 a87bede7d76d6601d8b2986dca8d882401ba1a85 jabberd-1.4.3.tar.gz 258016  | 
                    |
| 6 | 
                        -SHA256 aad60b39ebe9121a857e51ea226964ad5a21babff8ccb99cb25d6a45e96e1f57 jabberd-1.4.3.tar.gz 258016  | 
                    |
| 7 | 
                        -MD5 373f0f780c725cc06c824e322fc694ff xdb_ldap-1.0.tar.gz 112204  | 
                    |
| 8 | 
                        -RMD160 2b8722d8990944105dacd4a73bc45c24a72ccdfa xdb_ldap-1.0.tar.gz 112204  | 
                    |
| 9 | 
                        -SHA256 fdcdc9b65a40aff8ca38ad27fad701d7692f0976eb6344f5deae317d00d0c5bd xdb_ldap-1.0.tar.gz 112204  | 
                    
| ... | ... | 
                      @@ -1,12 +0,0 @@  | 
                  
| 1 | 
                        -# Copyright 1999-2004 Gentoo Foundation  | 
                    |
| 2 | 
                        -# Distributed under the terms of the GNU General Public License, v2 or later  | 
                    |
| 3 | 
                        -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber-conf.d,v 1.4 2004/07/14 23:45:05 agriffis Exp $  | 
                    |
| 4 | 
                        -  | 
                    |
| 5 | 
                        -# Configure which is the default jabberd server. Any value that is not  | 
                    |
| 6 | 
                        -# jabberd14 and jabberd2 will be started  | 
                    |
| 7 | 
                        -  | 
                    |
| 8 | 
                        -JABBERD="jabberd14"  | 
                    |
| 9 | 
                        -  | 
                    |
| 10 | 
                        -#Right now this is only used by the init script, but i would like to find a way  | 
                    |
| 11 | 
                        -#for jabberd to include this in the conf  | 
                    |
| 12 | 
                        -JPIDFILE="/var/log/jabber/jabberd14.pid"  | 
                    
| ... | ... | 
                      @@ -1,24 +0,0 @@  | 
                  
| 1 | 
                        -#!/sbin/runscript  | 
                    |
| 2 | 
                        -# Copyright 1999-2005 Gentoo Foundation  | 
                    |
| 3 | 
                        -# Distributed under the terms of the GNU General Public License v2  | 
                    |
| 4 | 
                        -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.init.bundled,v 1.1 2005/01/31 23:05:41 humpback Exp $  | 
                    |
| 5 | 
                        -  | 
                    |
| 6 | 
                        -depend() {
                       | 
                    |
| 7 | 
                        - need net  | 
                    |
| 8 | 
                        - use mysql postgresql slapd  | 
                    |
| 9 | 
                        - provide jabber-server  | 
                    |
| 10 | 
                        -}  | 
                    |
| 11 | 
                        -  | 
                    |
| 12 | 
                        -start() {
                       | 
                    |
| 13 | 
                        - ebegin "Starting Jabber Server"  | 
                    |
| 14 | 
                        - start-stop-daemon --start -c jabber:jabber \  | 
                    |
| 15 | 
                        - -b --make-pidfile --pidfile /var/jabberd/pid/jabberd.pid \  | 
                    |
| 16 | 
                        - -q -x /usr/bin/jabberd  | 
                    |
| 17 | 
                        - eend $?  | 
                    |
| 18 | 
                        -}  | 
                    |
| 19 | 
                        -  | 
                    |
| 20 | 
                        -stop() {
                       | 
                    |
| 21 | 
                        - ebegin "Stopping Jabber Server"  | 
                    |
| 22 | 
                        - start-stop-daemon --stop -q --pidfile /var/jabberd/pid/jabberd.pid  | 
                    |
| 23 | 
                        - eend $?  | 
                    |
| 24 | 
                        -}  | 
                    
| ... | ... | 
                      @@ -1,91 +0,0 @@  | 
                  
| 1 | 
                        -#!/sbin/runscript  | 
                    |
| 2 | 
                        -# Copyright 1999-2005 Gentoo Foundation  | 
                    |
| 3 | 
                        -# Distributed under the terms of the GNU General Public License v2  | 
                    |
| 4 | 
                        -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.init.gentoo,v 1.1 2005/01/31 23:05:41 humpback Exp $  | 
                    |
| 5 | 
                        -  | 
                    |
| 6 | 
                        -depend() {
                       | 
                    |
| 7 | 
                        - need net  | 
                    |
| 8 | 
                        - use mysql postgresql slapd  | 
                    |
| 9 | 
                        - provide jabber-server  | 
                    |
| 10 | 
                        -}  | 
                    |
| 11 | 
                        -  | 
                    |
| 12 | 
                        -components="router resolver sm c2s s2s"  | 
                    |
| 13 | 
                        -  | 
                    |
| 14 | 
                        -my_start() {
                       | 
                    |
| 15 | 
                        -	ebegin "-> Starting ${i}"
                       | 
                    |
| 16 | 
                        -	component=${i}
                       | 
                    |
| 17 | 
                        -#	pidfile=/var/jabberd/pid/${component}.pid
                       | 
                    |
| 18 | 
                        -# ## remove components pidfile  | 
                    |
| 19 | 
                        -#	rm -f "${pidfile}" >/dev/null 2>&1
                       | 
                    |
| 20 | 
                        - ## start component  | 
                    |
| 21 | 
                        - start-stop-daemon --start -c jabber:jabber -b \  | 
                    |
| 22 | 
                        -		-q -x /usr/bin/${component} >/dev/null 2>&1
                       | 
                    |
| 23 | 
                        -# ## check if pidfile exists  | 
                    |
| 24 | 
                        -#	if [ ! -f "${pidfile}" ]; then
                       | 
                    |
| 25 | 
                        -# false  | 
                    |
| 26 | 
                        -# ## check if pidfile contains the pid of a running process  | 
                    |
| 27 | 
                        -#	elif ! ps -p "$(< ${pidfile})" -o pid= >/dev/null 2>&1; then
                       | 
                    |
| 28 | 
                        -# false  | 
                    |
| 29 | 
                        -# fi  | 
                    |
| 30 | 
                        - eend $?  | 
                    |
| 31 | 
                        -}  | 
                    |
| 32 | 
                        -  | 
                    |
| 33 | 
                        -my_stop() {
                       | 
                    |
| 34 | 
                        -	ebegin "-> Stopping ${i}"
                       | 
                    |
| 35 | 
                        -	component=${i}
                       | 
                    |
| 36 | 
                        -	pidfile=/var/jabberd/pid/${component}.pid
                       | 
                    |
| 37 | 
                        -	start-stop-daemon --stop -q --pidfile ${pidfile} >/dev/null 2>&1
                       | 
                    |
| 38 | 
                        -#	if [ -f "${pidfile}" ] && ps -p "$(< ${pidfile})" -o pid= >/dev/null 2>&1; then
                       | 
                    |
| 39 | 
                        -# false  | 
                    |
| 40 | 
                        -# fi  | 
                    |
| 41 | 
                        -# ## remove components pidfile  | 
                    |
| 42 | 
                        -#	rm -f "${pidfile}" >/dev/null 2>&1
                       | 
                    |
| 43 | 
                        - eend $?  | 
                    |
| 44 | 
                        -}  | 
                    |
| 45 | 
                        -  | 
                    |
| 46 | 
                        -start() {
                       | 
                    |
| 47 | 
                        - ebegin "Starting Jabber Server"  | 
                    |
| 48 | 
                        - local started=''  | 
                    |
| 49 | 
                        - local failed=''  | 
                    |
| 50 | 
                        -	for i in ${components}; do
                       | 
                    |
| 51 | 
                        -		if ! my_start ${i}; then
                       | 
                    |
| 52 | 
                        -			failed="${failed:+${failed} }${i}"
                       | 
                    |
| 53 | 
                        - else  | 
                    |
| 54 | 
                        -			started="${started:+${started} }${i}"
                       | 
                    |
| 55 | 
                        - fi  | 
                    |
| 56 | 
                        - done  | 
                    |
| 57 | 
                        -	if [ -n "${failed}" ]; then
                       | 
                    |
| 58 | 
                        - eerror  | 
                    |
| 59 | 
                        - eerror "The following components failed to start:"  | 
                    |
| 60 | 
                        -		eerror "-> ${failed}"
                       | 
                    |
| 61 | 
                        - eerror  | 
                    |
| 62 | 
                        - eerror "Trying to stop started components"  | 
                    |
| 63 | 
                        -		for i in ${started}; do
                       | 
                    |
| 64 | 
                        -			my_stop ${i}
                       | 
                    |
| 65 | 
                        - done  | 
                    |
| 66 | 
                        - false  | 
                    |
| 67 | 
                        - fi  | 
                    |
| 68 | 
                        - eend $?  | 
                    |
| 69 | 
                        -}  | 
                    |
| 70 | 
                        -  | 
                    |
| 71 | 
                        -stop() {
                       | 
                    |
| 72 | 
                        - ebegin "Stopping Jabber Server"  | 
                    |
| 73 | 
                        - local failed=''  | 
                    |
| 74 | 
                        -	for i in ${components}; do
                       | 
                    |
| 75 | 
                        -		if ! my_stop ${i}; then
                       | 
                    |
| 76 | 
                        -			failed="${failed:+${failed} }${i}"
                       | 
                    |
| 77 | 
                        - fi  | 
                    |
| 78 | 
                        - done  | 
                    |
| 79 | 
                        -	if [ -n "${failed}" ]; then
                       | 
                    |
| 80 | 
                        - eerror  | 
                    |
| 81 | 
                        - eerror "The following components failed to stop:"  | 
                    |
| 82 | 
                        -		eerror "-> ${failed}"
                       | 
                    |
| 83 | 
                        - eerror  | 
                    |
| 84 | 
                        - eerror "Please kill the processes manually and reset"  | 
                    |
| 85 | 
                        - eerror "this service to a stopped state using"  | 
                    |
| 86 | 
                        -		eerror "-> ${0} zap"
                       | 
                    |
| 87 | 
                        - eerror  | 
                    |
| 88 | 
                        - false  | 
                    |
| 89 | 
                        - fi  | 
                    |
| 90 | 
                        - eend $?  | 
                    |
| 91 | 
                        -}  | 
                    
| ... | ... | 
                      @@ -1,39 +0,0 @@  | 
                  
| 1 | 
                        -#!/sbin/runscript  | 
                    |
| 2 | 
                        -# Copyright 1999-2004 Gentoo Foundation  | 
                    |
| 3 | 
                        -# Distributed under the terms of the GNU General Public License v2  | 
                    |
| 4 | 
                        -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r5,v 1.4 2004/07/14 23:45:05 agriffis Exp $  | 
                    |
| 5 | 
                        -  | 
                    |
| 6 | 
                        -depend() {
                       | 
                    |
| 7 | 
                        - need net  | 
                    |
| 8 | 
                        -}  | 
                    |
| 9 | 
                        -  | 
                    |
| 10 | 
                        -start() {
                       | 
                    |
| 11 | 
                        - ebegin "Starting Jabber Server"  | 
                    |
| 12 | 
                        -  | 
                    |
| 13 | 
                        - jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1  | 
                    |
| 14 | 
                        - for addon in /etc/jabber/*.xml; do  | 
                    |
| 15 | 
                        - if [ "$addon" == "/etc/jabber/jit.xml" ]; then  | 
                    |
| 16 | 
                        - jit-wpjabber -d -c $addon >/dev/null 2>&1  | 
                    |
| 17 | 
                        - else  | 
                    |
| 18 | 
                        - if [ "$addon" != "/etc/jabber/multiple.xml" ]; then  | 
                    |
| 19 | 
                        - jabberd -B -c $addon >/dev/null 2>&1  | 
                    |
| 20 | 
                        - fi  | 
                    |
| 21 | 
                        - fi  | 
                    |
| 22 | 
                        - done  | 
                    |
| 23 | 
                        -  | 
                    |
| 24 | 
                        - eend $?  | 
                    |
| 25 | 
                        -}  | 
                    |
| 26 | 
                        -  | 
                    |
| 27 | 
                        -stop() {
                       | 
                    |
| 28 | 
                        - ebegin "Stopping Jabber Server"  | 
                    |
| 29 | 
                        - killall jabberd  | 
                    |
| 30 | 
                        - if [ "$addon" == "/etc/jabber/jit.xml" ]; then  | 
                    |
| 31 | 
                        - killall jit-wpjabber  | 
                    |
| 32 | 
                        - fi  | 
                    |
| 33 | 
                        - sleep 2  | 
                    |
| 34 | 
                        - killall -9 jabberd  | 
                    |
| 35 | 
                        - if [ "$addon" == "/etc/jabber/jit.xml" ]; then  | 
                    |
| 36 | 
                        - killall -9 jit-wpjabber  | 
                    |
| 37 | 
                        - fi  | 
                    |
| 38 | 
                        - eend $?  | 
                    |
| 39 | 
                        -}  | 
                    
| ... | ... | 
                      @@ -1,45 +0,0 @@  | 
                  
| 1 | 
                        -#!/sbin/runscript  | 
                    |
| 2 | 
                        -# Copyright 1999-2004 Gentoo Foundation  | 
                    |
| 3 | 
                        -# Distributed under the terms of the GNU General Public License v2  | 
                    |
| 4 | 
                        -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r6,v 1.3 2004/07/14 23:45:05 agriffis Exp $  | 
                    |
| 5 | 
                        -  | 
                    |
| 6 | 
                        -depend() {
                       | 
                    |
| 7 | 
                        - need net  | 
                    |
| 8 | 
                        -}  | 
                    |
| 9 | 
                        -  | 
                    |
| 10 | 
                        -start() {
                       | 
                    |
| 11 | 
                        - ebegin "Starting Jabber Server"  | 
                    |
| 12 | 
                        -  | 
                    |
| 13 | 
                        - jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1  | 
                    |
| 14 | 
                        - for addon in /etc/jabber/*.xml; do  | 
                    |
| 15 | 
                        - if [ "$addon" == "/etc/jabber/jit.xml" ]; then  | 
                    |
| 16 | 
                        - jit-wpjabber -d -c $addon >/dev/null 2>&1  | 
                    |
| 17 | 
                        - else  | 
                    |
| 18 | 
                        - if [ "$addon" != "/etc/jabber/multiple.xml" ]; then  | 
                    |
| 19 | 
                        - jabberd -B -c $addon >/dev/null 2>&1  | 
                    |
| 20 | 
                        - fi  | 
                    |
| 21 | 
                        - fi  | 
                    |
| 22 | 
                        - done  | 
                    |
| 23 | 
                        -  | 
                    |
| 24 | 
                        - eend $?  | 
                    |
| 25 | 
                        -}  | 
                    |
| 26 | 
                        -  | 
                    |
| 27 | 
                        -stop() {
                       | 
                    |
| 28 | 
                        - ebegin "Stopping Jabber Server"  | 
                    |
| 29 | 
                        -  | 
                    |
| 30 | 
                        - killall jabberd  | 
                    |
| 31 | 
                        - sleep 2  | 
                    |
| 32 | 
                        - if (( `ps -e | grep jabberd | wc -l`>0 )); then  | 
                    |
| 33 | 
                        - killall -9 jabberd  | 
                    |
| 34 | 
                        - fi  | 
                    |
| 35 | 
                        -  | 
                    |
| 36 | 
                        - if [ -e /etc/jabber/jit.xml ]; then  | 
                    |
| 37 | 
                        - killall jit-wpjabber  | 
                    |
| 38 | 
                        - sleep 2  | 
                    |
| 39 | 
                        - if (( `ps -e | grep jit-wpjabber | wc -l`>0 )); then  | 
                    |
| 40 | 
                        - killall -9 jit-wpjabber  | 
                    |
| 41 | 
                        - fi  | 
                    |
| 42 | 
                        - fi  | 
                    |
| 43 | 
                        -  | 
                    |
| 44 | 
                        - eend $?  | 
                    |
| 45 | 
                        -}  | 
                    
| ... | ... | 
                      @@ -1,71 +0,0 @@  | 
                  
| 1 | 
                        -#!/sbin/runscript  | 
                    |
| 2 | 
                        -# Copyright 1999-2004 Gentoo Foundation  | 
                    |
| 3 | 
                        -# Distributed under the terms of the GNU General Public License v2  | 
                    |
| 4 | 
                        -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r7,v 1.7 2004/07/14 23:45:05 agriffis Exp $  | 
                    |
| 5 | 
                        -  | 
                    |
| 6 | 
                        -depend() {
                       | 
                    |
| 7 | 
                        - need net  | 
                    |
| 8 | 
                        - provide jabber-server  | 
                    |
| 9 | 
                        -}  | 
                    |
| 10 | 
                        -  | 
                    |
| 11 | 
                        -start() {
                       | 
                    |
| 12 | 
                        - ebegin "Starting main Jabber Component"  | 
                    |
| 13 | 
                        -	if [ "${JABBERD}" = "jabberd14" ]
                       | 
                    |
| 14 | 
                        - then  | 
                    |
| 15 | 
                        -		if [ -f ${JPIDFILE} ]; then
                       | 
                    |
| 16 | 
                        -			if [ -z $(ps ax | grep `cat ${JPIDFILE}` | grep -v grep ) ]
                       | 
                    |
| 17 | 
                        - then  | 
                    |
| 18 | 
                        -				rm -f ${JPIDFILE}
                       | 
                    |
| 19 | 
                        - fi  | 
                    |
| 20 | 
                        - fi  | 
                    |
| 21 | 
                        - jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1  | 
                    |
| 22 | 
                        - else  | 
                    |
| 23 | 
                        - ebegin " Router"  | 
                    |
| 24 | 
                        - start-stop-daemon --start -b -q -x /usr/bin/router  | 
                    |
| 25 | 
                        - eend $?  | 
                    |
| 26 | 
                        - ebegin " Resolver"  | 
                    |
| 27 | 
                        - start-stop-daemon --start -b -q -x /usr/bin/resolver  | 
                    |
| 28 | 
                        - eend $?  | 
                    |
| 29 | 
                        - ebegin " Session Manager"  | 
                    |
| 30 | 
                        - start-stop-daemon --start -b -q -x /usr/bin/sm  | 
                    |
| 31 | 
                        - eend $?  | 
                    |
| 32 | 
                        - ebegin " Client to Server Component"  | 
                    |
| 33 | 
                        - start-stop-daemon --start -b -q -x /usr/bin/c2s  | 
                    |
| 34 | 
                        - eend $?  | 
                    |
| 35 | 
                        - ebegin " Server to Server Component"  | 
                    |
| 36 | 
                        - start-stop-daemon --start -b -q -x /usr/bin/s2s  | 
                    |
| 37 | 
                        - eend $?  | 
                    |
| 38 | 
                        - fi  | 
                    |
| 39 | 
                        -  | 
                    |
| 40 | 
                        - eend $?  | 
                    |
| 41 | 
                        -}  | 
                    |
| 42 | 
                        -  | 
                    |
| 43 | 
                        -stop() {
                       | 
                    |
| 44 | 
                        - ebegin "Stopping main Jabber Component"  | 
                    |
| 45 | 
                        -	if [ "${JABBERD}" = "jabberd14" ]
                       | 
                    |
| 46 | 
                        - then  | 
                    |
| 47 | 
                        -		kill `cat ${JPIDFILE}`
                       | 
                    |
| 48 | 
                        - sleep 2  | 
                    |
| 49 | 
                        -        	if [ -f ${JPIDFILE} ]; then
                       | 
                    |
| 50 | 
                        -			kill -9 `cat ${JPIDFILE}`
                       | 
                    |
| 51 | 
                        -			rm -f ${JPIDFILE}
                       | 
                    |
| 52 | 
                        - fi  | 
                    |
| 53 | 
                        - else  | 
                    |
| 54 | 
                        - ebegin " Router"  | 
                    |
| 55 | 
                        - start-stop-daemon --stop -q --pidfile /var/jabberd/pid/router.pid  | 
                    |
| 56 | 
                        - eend $?  | 
                    |
| 57 | 
                        - ebegin " Resolver"  | 
                    |
| 58 | 
                        - start-stop-daemon --stop -q --pidfile /var/jabberd/pid/resolver.pid  | 
                    |
| 59 | 
                        - eend $?  | 
                    |
| 60 | 
                        - ebegin " Session Manager"  | 
                    |
| 61 | 
                        - start-stop-daemon --stop -q --pidfile /var/jabberd/pid/sm.pid  | 
                    |
| 62 | 
                        - eend $?  | 
                    |
| 63 | 
                        - ebegin " Client to Server Component"  | 
                    |
| 64 | 
                        - start-stop-daemon --stop -q --pidfile /var/jabberd/pid/c2s.pid  | 
                    |
| 65 | 
                        - eend $?  | 
                    |
| 66 | 
                        - ebegin " Server to Server Component"  | 
                    |
| 67 | 
                        - start-stop-daemon --stop -q --pidfile /var/jabberd/pid/s2s.pid  | 
                    |
| 68 | 
                        - eend $?  | 
                    |
| 69 | 
                        - fi  | 
                    |
| 70 | 
                        - eend $?  | 
                    |
| 71 | 
                        -}  | 
                    
| ... | ... | 
                      @@ -1,34 +0,0 @@  | 
                  
| 1 | 
                        -#!/sbin/runscript  | 
                    |
| 2 | 
                        -# Copyright 1999-2005 Gentoo Foundation  | 
                    |
| 3 | 
                        -# Distributed under the terms of the GNU General Public License v2  | 
                    |
| 4 | 
                        -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r8,v 1.1 2005/05/21 18:35:51 humpback Exp $  | 
                    |
| 5 | 
                        -  | 
                    |
| 6 | 
                        -depend() {
                       | 
                    |
| 7 | 
                        - need net  | 
                    |
| 8 | 
                        - provide jabber-server  | 
                    |
| 9 | 
                        -}  | 
                    |
| 10 | 
                        -  | 
                    |
| 11 | 
                        -start() {
                       | 
                    |
| 12 | 
                        - ebegin "Starting Jabber Server"  | 
                    |
| 13 | 
                        -	if [ -f ${JPIDFILE} ]; then
                       | 
                    |
| 14 | 
                        -		if [ -z $(ps ax | grep `cat ${JPIDFILE}` | grep -v grep ) ]
                       | 
                    |
| 15 | 
                        - then  | 
                    |
| 16 | 
                        -			rm -f ${JPIDFILE}
                       | 
                    |
| 17 | 
                        - fi  | 
                    |
| 18 | 
                        - fi  | 
                    |
| 19 | 
                        - start-stop-daemon --start -c jabber:jabber \  | 
                    |
| 20 | 
                        - -x /usr/sbin/jabberd -- -B -c /etc/jabber/multiple.xml  | 
                    |
| 21 | 
                        - eend $?  | 
                    |
| 22 | 
                        -}  | 
                    |
| 23 | 
                        -  | 
                    |
| 24 | 
                        -stop() {
                       | 
                    |
| 25 | 
                        - ebegin "Stopping Jabber Server"  | 
                    |
| 26 | 
                        - start-stop-daemon --stop -x /usr/sbin/jabberd  | 
                    |
| 27 | 
                        -	kill `cat ${JPIDFILE}`
                       | 
                    |
| 28 | 
                        - sleep 2  | 
                    |
| 29 | 
                        -	if [ -f ${JPIDFILE} ]; then
                       | 
                    |
| 30 | 
                        -		kill -9 `cat ${JPIDFILE}`
                       | 
                    |
| 31 | 
                        -		rm -f ${JPIDFILE}
                       | 
                    |
| 32 | 
                        - fi  | 
                    |
| 33 | 
                        - eend $?  | 
                    |
| 34 | 
                        -}  | 
                    
| ... | ... | 
                      @@ -1,170 +0,0 @@  | 
                  
| 1 | 
                        ---- jabber.xml 2004-02-13 01:57:46.144389448 +0000  | 
                    |
| 2 | 
                        -+++ jabber.xml2 2004-02-13 01:57:01.725142200 +0000  | 
                    |
| 3 | 
                        -@@ -133,13 +133,13 @@  | 
                    |
| 4 | 
                        - a message after each valid registration if the notify  | 
                    |
| 5 | 
                        - attribute is present.  | 
                    |
| 6 | 
                        - -->  | 
                    |
| 7 | 
                        --  | 
                    |
| 8 | 
                        -+ <!-- commented out so no one can register!!!  | 
                    |
| 9 | 
                        - <register notify="yes">  | 
                    |
| 10 | 
                        - <instructions>Choose a username and password to register with this server.</instructions>  | 
                    |
| 11 | 
                        - <name/>  | 
                    |
| 12 | 
                        - <email/>  | 
                    |
| 13 | 
                        - </register>  | 
                    |
| 14 | 
                        --  | 
                    |
| 15 | 
                        -+ -->  | 
                    |
| 16 | 
                        - <!--  | 
                    |
| 17 | 
                        - A welcome note that is sent to every new user who registers  | 
                    |
| 18 | 
                        - with your server. Comment it out to disable this function.  | 
                    |
| 19 | 
                        -@@ -178,7 +178,7 @@  | 
                    |
| 20 | 
                        - sent in response to any admin messages.  | 
                    |
| 21 | 
                        - -->  | 
                    |
| 22 | 
                        -  | 
                    |
| 23 | 
                        -- <!--  | 
                    |
| 24 | 
                        -+  | 
                    |
| 25 | 
                        - <admin>  | 
                    |
| 26 | 
                        - <read>support@localhost</read>  | 
                    |
| 27 | 
                        - <write>admin@localhost</write>  | 
                    |
| 28 | 
                        -@@ -187,7 +187,7 @@  | 
                    |
| 29 | 
                        - <body>This is a special administrative address. Your message was received and forwarded to server administrators.</body>  | 
                    |
| 30 | 
                        - </reply>  | 
                    |
| 31 | 
                        - </admin>  | 
                    |
| 32 | 
                        -- -->  | 
                    |
| 33 | 
                        -+  | 
                    |
| 34 | 
                        -  | 
                    |
| 35 | 
                        - <!--  | 
                    |
| 36 | 
                        - This enables the server to automatically update the  | 
                    |
| 37 | 
                        -@@ -295,21 +295,21 @@  | 
                    |
| 38 | 
                        - -->  | 
                    |
| 39 | 
                        -  | 
                    |
| 40 | 
                        - <load main="jsm">  | 
                    |
| 41 | 
                        -- <jsm>./jsm/jsm.so</jsm>  | 
                    |
| 42 | 
                        -- <mod_echo>./jsm/jsm.so</mod_echo>  | 
                    |
| 43 | 
                        -- <mod_roster>./jsm/jsm.so</mod_roster>  | 
                    |
| 44 | 
                        -- <mod_time>./jsm/jsm.so</mod_time>  | 
                    |
| 45 | 
                        -- <mod_vcard>./jsm/jsm.so</mod_vcard>  | 
                    |
| 46 | 
                        -- <mod_last>./jsm/jsm.so</mod_last>  | 
                    |
| 47 | 
                        -- <mod_version>./jsm/jsm.so</mod_version>  | 
                    |
| 48 | 
                        -- <mod_announce>./jsm/jsm.so</mod_announce>  | 
                    |
| 49 | 
                        -- <mod_agents>./jsm/jsm.so</mod_agents>  | 
                    |
| 50 | 
                        -- <mod_browse>./jsm/jsm.so</mod_browse>  | 
                    |
| 51 | 
                        -- <mod_disco>./jsm/jsm.so</mod_disco>  | 
                    |
| 52 | 
                        -- <mod_admin>./jsm/jsm.so</mod_admin>  | 
                    |
| 53 | 
                        -- <mod_filter>./jsm/jsm.so</mod_filter>  | 
                    |
| 54 | 
                        -- <mod_offline>./jsm/jsm.so</mod_offline>  | 
                    |
| 55 | 
                        -- <mod_presence>./jsm/jsm.so</mod_presence>  | 
                    |
| 56 | 
                        -+ <jsm>/usr/lib/jabberd/jsm.so</jsm>  | 
                    |
| 57 | 
                        -+ <mod_echo>/usr/lib/jabberd/jsm.so</mod_echo>  | 
                    |
| 58 | 
                        -+ <mod_roster>/usr/lib/jabberd/jsm.so</mod_roster>  | 
                    |
| 59 | 
                        -+ <mod_time>/usr/lib/jabberd/jsm.so</mod_time>  | 
                    |
| 60 | 
                        -+ <mod_vcard>/usr/lib/jabberd/jsm.so</mod_vcard>  | 
                    |
| 61 | 
                        -+ <mod_last>/usr/lib/jabberd/jsm.so</mod_last>  | 
                    |
| 62 | 
                        -+ <mod_version>/usr/lib/jabberd/jsm.so</mod_version>  | 
                    |
| 63 | 
                        -+ <mod_announce>/usr/lib/jabberd/jsm.so</mod_announce>  | 
                    |
| 64 | 
                        -+ <mod_agents>/usr/lib/jabberd/jsm.so</mod_agents>  | 
                    |
| 65 | 
                        -+ <mod_browse>/usr/lib/jabberd/jsm.so</mod_browse>  | 
                    |
| 66 | 
                        -+ <mod_disco>/usr/lib/jabberd/jsm.so</mod_disco>  | 
                    |
| 67 | 
                        -+ <mod_admin>/usr/lib/jabberd/jsm.so</mod_admin>  | 
                    |
| 68 | 
                        -+ <mod_filter>/usr/lib/jabberd/jsm.so</mod_filter>  | 
                    |
| 69 | 
                        -+ <mod_offline>/usr/lib/jabberd/jsm.so</mod_offline>  | 
                    |
| 70 | 
                        -+ <mod_presence>/usr/lib/jabberd/jsm.so</mod_presence>  | 
                    |
| 71 | 
                        -  | 
                    |
| 72 | 
                        - <!--  | 
                    |
| 73 | 
                        - Authentication  | 
                    |
| 74 | 
                        -@@ -325,19 +325,21 @@  | 
                    |
| 75 | 
                        - -->  | 
                    |
| 76 | 
                        - <!-- mod_auth_digest: Password in clear text in storage,  | 
                    |
| 77 | 
                        - encrypted/hashed on the wire -->  | 
                    |
| 78 | 
                        -- <mod_auth_digest>./jsm/jsm.so</mod_auth_digest>  | 
                    |
| 79 | 
                        -+ <mod_auth_digest>/usr/lib/jabberd/jsm.so</mod_auth_digest>  | 
                    |
| 80 | 
                        - <!-- mod_auth_plain: Password in clear text in storage  | 
                    |
| 81 | 
                        - and on the wire. Disable this if you do not use clients  | 
                    |
| 82 | 
                        - that need plaintext auth -->  | 
                    |
| 83 | 
                        -- <mod_auth_plain>./jsm/jsm.so</mod_auth_plain>  | 
                    |
| 84 | 
                        -+ <mod_auth_plain>/usr/lib/jabberd/jsm.so</mod_auth_plain>  | 
                    |
| 85 | 
                        - <!-- mod_auth_crypt: Password encrypted/hashed in storage,  | 
                    |
| 86 | 
                        - clear text on the wire. Disabled as this only makes  | 
                    |
| 87 | 
                        - sense when used exclusively and with SSL mandatory  | 
                    |
| 88 | 
                        -- <mod_auth_crypt>./jsm/jsm.so</mod_auth_crypt> -->  | 
                    |
| 89 | 
                        -+ <mod_auth_crypt>/usr/lib/jabberd/jsm.so</mod_auth_crypt> -->  | 
                    |
| 90 | 
                        -  | 
                    |
| 91 | 
                        -- <mod_log>./jsm/jsm.so</mod_log>  | 
                    |
| 92 | 
                        -- <mod_register>./jsm/jsm.so</mod_register>  | 
                    |
| 93 | 
                        -- <mod_xml>./jsm/jsm.so</mod_xml>  | 
                    |
| 94 | 
                        -+ <mod_log>/usr/lib/jabberd/jsm.so</mod_log>  | 
                    |
| 95 | 
                        -+ <!-- commented out so no one can register!!!  | 
                    |
| 96 | 
                        -+ <mod_register>/usr/lib/jabberd/jsm.so</mod_register>  | 
                    |
| 97 | 
                        -+ -->  | 
                    |
| 98 | 
                        -+ <mod_xml>/usr/lib/jabberd/jsm.so</mod_xml>  | 
                    |
| 99 | 
                        - </load>  | 
                    |
| 100 | 
                        -  | 
                    |
| 101 | 
                        - </service>  | 
                    |
| 102 | 
                        -@@ -353,10 +355,10 @@  | 
                    |
| 103 | 
                        - <xdb id="xdb">  | 
                    |
| 104 | 
                        - <host/>  | 
                    |
| 105 | 
                        - <load>  | 
                    |
| 106 | 
                        -- <xdb_file>./xdb_file/xdb_file.so</xdb_file>  | 
                    |
| 107 | 
                        -+ <xdb_file>/usr/lib/jabberd/xdb_file.so</xdb_file>  | 
                    |
| 108 | 
                        - </load>  | 
                    |
| 109 | 
                        - <xdb_file xmlns="jabber:config:xdb_file">  | 
                    |
| 110 | 
                        -- <spool><jabberd:cmdline flag='s'>./spool</jabberd:cmdline></spool>  | 
                    |
| 111 | 
                        -+ <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>  | 
                    |
| 112 | 
                        - </xdb_file>  | 
                    |
| 113 | 
                        - </xdb>  | 
                    |
| 114 | 
                        -  | 
                    |
| 115 | 
                        -@@ -387,7 +389,7 @@  | 
                    |
| 116 | 
                        -  | 
                    |
| 117 | 
                        - <service id="c2s">  | 
                    |
| 118 | 
                        - <load>  | 
                    |
| 119 | 
                        -- <pthsock_client>./pthsock/pthsock_client.so</pthsock_client>  | 
                    |
| 120 | 
                        -+ <pthsock_client>/usr/lib/jabberd/pthsock_client.so</pthsock_client>  | 
                    |
| 121 | 
                        - </load>  | 
                    |
| 122 | 
                        - <pthcsock xmlns='jabber:config:pth-csock'>  | 
                    |
| 123 | 
                        - <authtime/>  | 
                    |
| 124 | 
                        -@@ -430,7 +432,7 @@  | 
                    |
| 125 | 
                        - <host/>  | 
                    |
| 126 | 
                        - <logtype/>  | 
                    |
| 127 | 
                        - <format>%d: [%t] (%h): %s</format>  | 
                    |
| 128 | 
                        -- <file>error.log</file>  | 
                    |
| 129 | 
                        -+ <file>/var/log/jabber/error.log</file>  | 
                    |
| 130 | 
                        - <stderr/>  | 
                    |
| 131 | 
                        - </log>  | 
                    |
| 132 | 
                        -  | 
                    |
| 133 | 
                        -@@ -443,7 +445,7 @@  | 
                    |
| 134 | 
                        - <host/>  | 
                    |
| 135 | 
                        - <logtype>record</logtype>  | 
                    |
| 136 | 
                        - <format>%d %h %s</format>  | 
                    |
| 137 | 
                        -- <file>record.log</file>  | 
                    |
| 138 | 
                        -+ <file>/var/log/jabber/record.log</file>  | 
                    |
| 139 | 
                        - </log>  | 
                    |
| 140 | 
                        -  | 
                    |
| 141 | 
                        - <!-- The following two services are for handling server-to-server traffic. -->  | 
                    |
| 142 | 
                        -@@ -453,7 +455,7 @@  | 
                    |
| 143 | 
                        - <service id="dnsrv">  | 
                    |
| 144 | 
                        - <host/>  | 
                    |
| 145 | 
                        - <load>  | 
                    |
| 146 | 
                        -- <dnsrv>./dnsrv/dnsrv.so</dnsrv>  | 
                    |
| 147 | 
                        -+ <dnsrv>/usr/lib/jabberd/dnsrv.so</dnsrv>  | 
                    |
| 148 | 
                        - </load>  | 
                    |
| 149 | 
                        - <dnsrv xmlns="jabber:config:dnsrv">  | 
                    |
| 150 | 
                        - <resend service="_xmpp-server._tcp">s2s</resend> <!-- for supporting XMPP compliant SRV records -->  | 
                    |
| 151 | 
                        -@@ -473,7 +475,7 @@  | 
                    |
| 152 | 
                        -  | 
                    |
| 153 | 
                        - <service id="s2s">  | 
                    |
| 154 | 
                        - <load>  | 
                    |
| 155 | 
                        -- <dialback>./dialback/dialback.so</dialback>  | 
                    |
| 156 | 
                        -+ <dialback>/usr/lib/jabberd/dialback.so</dialback>  | 
                    |
| 157 | 
                        - </load>  | 
                    |
| 158 | 
                        - <dialback xmlns='jabber:config:dialback'>  | 
                    |
| 159 | 
                        - <legacy/>  | 
                    |
| 160 | 
                        -@@ -641,8 +643,8 @@  | 
                    |
| 161 | 
                        - -->  | 
                    |
| 162 | 
                        - <!--  | 
                    |
| 163 | 
                        - <ssl>  | 
                    |
| 164 | 
                        -- <key ip='192.168.1.1'>/path/to/cert_and_key.pem</key>  | 
                    |
| 165 | 
                        -- <key ip='192.168.1.100'>/path/to/other/cert_and_key.pem</key>  | 
                    |
| 166 | 
                        -+ <key ip='192.168.1.1'>/etc/jabber/gentoo.pem</key>  | 
                    |
| 167 | 
                        -+ <key ip='192.168.1.100'>/etc/jabber/gentoo.pem</key>  | 
                    |
| 168 | 
                        - </ssl>  | 
                    |
| 169 | 
                        - -->  | 
                    |
| 170 | 
                        -  | 
                    
| ... | ... | 
                      @@ -1,11 +0,0 @@  | 
                  
| 1 | 
                        ---- jabber.xml 2004-03-28 17:41:06.867787280 +0100  | 
                    |
| 2 | 
                        -+++ jabber2.xml 2004-03-28 17:40:49.470432080 +0100  | 
                    |
| 3 | 
                        -@@ -670,7 +670,7 @@  | 
                    |
| 4 | 
                        - <!--  | 
                    |
| 5 | 
                        - This specifies the file to store the pid of the process in.  | 
                    |
| 6 | 
                        - -->  | 
                    |
| 7 | 
                        -- <pidfile>./jabber.pid</pidfile>  | 
                    |
| 8 | 
                        -+ <pidfile>/var/log/jabber/jabberd14.pid</pidfile>  | 
                    |
| 9 | 
                        -  | 
                    |
| 10 | 
                        -  | 
                    |
| 11 | 
                        - </jabber>  | 
                    
| ... | ... | 
                      @@ -1,465 +0,0 @@  | 
                  
| 1 | 
                        -<jabber>  | 
                    |
| 2 | 
                        - <!--  | 
                    |
| 3 | 
                        - This is the Jabber server configuration file. The file is  | 
                    |
| 4 | 
                        - broken into different sections based on the services being  | 
                    |
| 5 | 
                        - managed by jabberd, the server daemon. Most of the important  | 
                    |
| 6 | 
                        - sections have comments and are easy to modify.  | 
                    |
| 7 | 
                        -  | 
                    |
| 8 | 
                        - At http://jabberd.jabberstudio.org/1.4/ you find further  | 
                    |
| 9 | 
                        - instructions including an annotated version of this con-  | 
                    |
| 10 | 
                        - figuration file and an installation guide.  | 
                    |
| 11 | 
                        -  | 
                    |
| 12 | 
                        - Note that when you see a tag like "jabberd:cmdline", it's  | 
                    |
| 13 | 
                        - automatically replaced on startup with the command line flag  | 
                    |
| 14 | 
                        - passed in to jabberd. This enables you to override para-  | 
                    |
| 15 | 
                        - meters set in this configuration file if necessary or de-  | 
                    |
| 16 | 
                        - sired. Also note as you comment things in and out that  | 
                    |
| 17 | 
                        - jabberd does not like comments within comments, so be care-  | 
                    |
| 18 | 
                        - ful with your XML. :)  | 
                    |
| 19 | 
                        - -->  | 
                    |
| 20 | 
                        -  | 
                    |
| 21 | 
                        -  | 
                    |
| 22 | 
                        - <!--  | 
                    |
| 23 | 
                        - The following <service/> section is for the session manager,  | 
                    |
| 24 | 
                        - the most important component within the server. This section  | 
                    |
| 25 | 
                        - contains the following types of information:  | 
                    |
| 26 | 
                        -  | 
                    |
| 27 | 
                        - * the server's hostname  | 
                    |
| 28 | 
                        - * other basic server information  | 
                    |
| 29 | 
                        - * the location of the session log file  | 
                    |
| 30 | 
                        - * email addresses for server administrators  | 
                    |
| 31 | 
                        - * registration instructions for new users  | 
                    |
| 32 | 
                        - * a welcome message for new users  | 
                    |
| 33 | 
                        - * a list of agents with which users can register  | 
                    |
| 34 | 
                        - * load rules for the modules within the session manager  | 
                    |
| 35 | 
                        -  | 
                    |
| 36 | 
                        - -->  | 
                    |
| 37 | 
                        -  | 
                    |
| 38 | 
                        - <service id="sessions">  | 
                    |
| 39 | 
                        - <!--  | 
                    |
| 40 | 
                        - Replace all occurrences of "localhost" in this file by  | 
                    |
| 41 | 
                        - the hostname of your Jabber server. Be aware changing  | 
                    |
| 42 | 
                        - the server's name is all but impossible once users start  | 
                    |
| 43 | 
                        - to use the server. So choose a name that is permanent  | 
                    |
| 44 | 
                        - (especially no Intranet hostnames or IP addresses).  | 
                    |
| 45 | 
                        -  | 
                    |
| 46 | 
                        - Multiple <host/> entries are allowed - each one is for a  | 
                    |
| 47 | 
                        - separate virtual server. Note that each host entry must  | 
                    |
| 48 | 
                        - be on one line, the server doesn't like it otherwise! :)  | 
                    |
| 49 | 
                        - Use lowercase for the hostname.  | 
                    |
| 50 | 
                        - -->  | 
                    |
| 51 | 
                        -  | 
                    |
| 52 | 
                        - <host><jabberd:cmdline flag="h">localhost</jabberd:cmdline></host>  | 
                    |
| 53 | 
                        -  | 
                    |
| 54 | 
                        - <!--  | 
                    |
| 55 | 
                        - This is the custom configuration section for the  | 
                    |
| 56 | 
                        - Jabber session manager, a.k.a. "JSM".  | 
                    |
| 57 | 
                        - -->  | 
                    |
| 58 | 
                        -  | 
                    |
| 59 | 
                        - <jsm xmlns="jabber:config:jsm">  | 
                    |
| 60 | 
                        -  | 
                    |
| 61 | 
                        - <filter>  | 
                    |
| 62 | 
                        - <default/>  | 
                    |
| 63 | 
                        - <max_size>100</max_size>  | 
                    |
| 64 | 
                        - <allow>  | 
                    |
| 65 | 
                        - <conditions>  | 
                    |
| 66 | 
                        - <ns/>  | 
                    |
| 67 | 
                        - <unavailable/>  | 
                    |
| 68 | 
                        - <from/>  | 
                    |
| 69 | 
                        - <resource/>  | 
                    |
| 70 | 
                        - <subject/>  | 
                    |
| 71 | 
                        - <body/>  | 
                    |
| 72 | 
                        - <show/>  | 
                    |
| 73 | 
                        - <type/>  | 
                    |
| 74 | 
                        - <roster/>  | 
                    |
| 75 | 
                        - <group/>  | 
                    |
| 76 | 
                        - </conditions>  | 
                    |
| 77 | 
                        - <actions>  | 
                    |
| 78 | 
                        - <error/>  | 
                    |
| 79 | 
                        - <offline/>  | 
                    |
| 80 | 
                        - <forward/>  | 
                    |
| 81 | 
                        - <reply/>  | 
                    |
| 82 | 
                        - <continue/>  | 
                    |
| 83 | 
                        - <settype/>  | 
                    |
| 84 | 
                        - </actions>  | 
                    |
| 85 | 
                        - </allow>  | 
                    |
| 86 | 
                        - </filter>  | 
                    |
| 87 | 
                        - <!-- The server vCard -->  | 
                    |
| 88 | 
                        - <vCard>  | 
                    |
| 89 | 
                        - <FN>localhost</FN>  | 
                    |
| 90 | 
                        - <DESC>localhost</DESC>  | 
                    |
| 91 | 
                        - <URL>http://localhost/</URL>  | 
                    |
| 92 | 
                        - </vCard>  | 
                    |
| 93 | 
                        -  | 
                    |
| 94 | 
                        - <!-- commented out so no one can register!!!  | 
                    |
| 95 | 
                        - <register notify="yes">  | 
                    |
| 96 | 
                        - <instructions>Choose a username and password to register with this server.</instructions>  | 
                    |
| 97 | 
                        - <name/>  | 
                    |
| 98 | 
                        - <email/>  | 
                    |
| 99 | 
                        - </register>  | 
                    |
| 100 | 
                        - -->  | 
                    |
| 101 | 
                        -  | 
                    |
| 102 | 
                        - <!--  | 
                    |
| 103 | 
                        - A welcome note that is sent to every new user who registers  | 
                    |
| 104 | 
                        - with your server. Comment it out to disable this function.  | 
                    |
| 105 | 
                        - -->  | 
                    |
| 106 | 
                        -  | 
                    |
| 107 | 
                        - <welcome>  | 
                    |
| 108 | 
                        - <subject>Welcome!</subject>  | 
                    |
| 109 | 
                        - <body>Welcome to the Private Jabber server at localhost -- we hope you enjoy this service! For Questions and Remarks, please contact Foo Bar [ foobar@localhost ]. </body>  | 
                    |
| 110 | 
                        - </welcome>  | 
                    |
| 111 | 
                        -  | 
                    |
| 112 | 
                        - <!--  | 
                    |
| 113 | 
                        - IDs with admin access - these people will receive admin  | 
                    |
| 114 | 
                        - messages (any message to="yourhostname" is an admin  | 
                    |
| 115 | 
                        - message). These addresses must be local ids, they cannot  | 
                    |
| 116 | 
                        - be remote addresses.  | 
                    |
| 117 | 
                        -  | 
                    |
| 118 | 
                        - Note that they can also send announcements to all  | 
                    |
| 119 | 
                        - users of the server, or to all online users. To use  | 
                    |
| 120 | 
                        - the announcement feature, you need to send raw xml and be  | 
                    |
| 121 | 
                        - logged in as one of the admin users. Here is the syntax  | 
                    |
| 122 | 
                        - for sending an announcement to online users:  | 
                    |
| 123 | 
                        -  | 
                    |
| 124 | 
                        - <message to="yourhostname/announce/online">  | 
                    |
| 125 | 
                        - <body>announcement here</body>  | 
                    |
| 126 | 
                        - </message>  | 
                    |
| 127 | 
                        -  | 
                    |
| 128 | 
                        - <message to="yourhostname/announce/motd">  | 
                    |
| 129 | 
                        - <body>message (of the day) that is sent only once to all users that are logged in and additionally to new ones as they log in</body>  | 
                    |
| 130 | 
                        - </message>  | 
                    |
| 131 | 
                        -  | 
                    |
| 132 | 
                        - Sending to /announce/motd/delete will remove any existing  | 
                    |
| 133 | 
                        - motd, and to /announce/motd/update will only update the motd  | 
                    |
| 134 | 
                        - without re-announcing to all logged in users.  | 
                    |
| 135 | 
                        -  | 
                    |
| 136 | 
                        - The <reply> will be the message that is automatically  | 
                    |
| 137 | 
                        - sent in response to any admin messages.  | 
                    |
| 138 | 
                        - -->  | 
                    |
| 139 | 
                        -  | 
                    |
| 140 | 
                        - <admin>  | 
                    |
| 141 | 
                        - <read>foobar@localhost</read>  | 
                    |
| 142 | 
                        - <write>foobar@localhost</write>  | 
                    |
| 143 | 
                        - <reply>  | 
                    |
| 144 | 
                        - <subject>Auto Reply</subject>  | 
                    |
| 145 | 
                        - <body>This is a special administrative address. Your message was received and forwarded to server administrators.</body>  | 
                    |
| 146 | 
                        - </reply>  | 
                    |
| 147 | 
                        - </admin>  | 
                    |
| 148 | 
                        -  | 
                    |
| 149 | 
                        -  | 
                    |
| 150 | 
                        - <vcard2jud/>  | 
                    |
| 151 | 
                        - <browse>  | 
                    |
| 152 | 
                        -  | 
                    |
| 153 | 
                        -<!-- Place to "advertise" your transports -->  | 
                    |
| 154 | 
                        -<!--  | 
                    |
| 155 | 
                        - The <browse/> section identifies the transports and other  | 
                    |
| 156 | 
                        - services that are available from this server. Note that each  | 
                    |
| 157 | 
                        - entity identified here must exist elsewhere or be further  | 
                    |
| 158 | 
                        - defined in its own <service/> section below. These services  | 
                    |
| 159 | 
                        - will appear in the user interface of Jabber clients that  | 
                    |
| 160 | 
                        - connect to your server.  | 
                    |
| 161 | 
                        - The <browse/> section is also used by mod_disco (see below)  | 
                    |
| 162 | 
                        - for building the disco#items reply.  | 
                    |
| 163 | 
                        - -->  | 
                    |
| 164 | 
                        -<!-- An example that would setup a Jabber User Directory could be:  | 
                    |
| 165 | 
                        -  | 
                    |
| 166 | 
                        -<service type="jud" jid="jud.localhost" name="Jabber User Directory">  | 
                    |
| 167 | 
                        - <ns>jabber:iq:search</ns>  | 
                    |
| 168 | 
                        - <ns>jabber:iq:register</ns>  | 
                    |
| 169 | 
                        -</service>  | 
                    |
| 170 | 
                        -  | 
                    |
| 171 | 
                        --->  | 
                    |
| 172 | 
                        - </browse>  | 
                    |
| 173 | 
                        - </jsm>  | 
                    |
| 174 | 
                        -  | 
                    |
| 175 | 
                        - <load main="jsm">  | 
                    |
| 176 | 
                        - <jsm>/usr/lib/jabberd/jsm.so</jsm>  | 
                    |
| 177 | 
                        - <mod_echo>/usr/lib/jabberd/jsm.so</mod_echo>  | 
                    |
| 178 | 
                        - <mod_roster>/usr/lib/jabberd/jsm.so</mod_roster>  | 
                    |
| 179 | 
                        - <mod_time>/usr/lib/jabberd/jsm.so</mod_time>  | 
                    |
| 180 | 
                        - <mod_vcard>/usr/lib/jabberd/jsm.so</mod_vcard>  | 
                    |
| 181 | 
                        - <mod_last>/usr/lib/jabberd/jsm.so</mod_last>  | 
                    |
| 182 | 
                        - <mod_version>/usr/lib/jabberd/jsm.so</mod_version>  | 
                    |
| 183 | 
                        - <mod_announce>/usr/lib/jabberd/jsm.so</mod_announce>  | 
                    |
| 184 | 
                        - <mod_agents>/usr/lib/jabberd/jsm.so</mod_agents>  | 
                    |
| 185 | 
                        - <mod_browse>/usr/lib/jabberd/jsm.so</mod_browse>  | 
                    |
| 186 | 
                        - <mod_admin>/usr/lib/jabberd/jsm.so</mod_admin>  | 
                    |
| 187 | 
                        - <mod_filter>/usr/lib/jabberd/jsm.so</mod_filter>  | 
                    |
| 188 | 
                        - <mod_offline>/usr/lib/jabberd/jsm.so</mod_offline>  | 
                    |
| 189 | 
                        - <mod_presence>/usr/lib/jabberd/jsm.so</mod_presence>  | 
                    |
| 190 | 
                        - <mod_auth_plain>/usr/lib/jabberd/jsm.so</mod_auth_plain>  | 
                    |
| 191 | 
                        - <mod_auth_digest>/usr/lib/jabberd/jsm.so</mod_auth_digest>  | 
                    |
| 192 | 
                        - <mod_log>/usr/lib/jabberd/jsm.so</mod_log>  | 
                    |
| 193 | 
                        -<!-- commented out so no one can register!!!  | 
                    |
| 194 | 
                        - <mod_register>/usr/lib/jabberd/jsm.so</mod_register>  | 
                    |
| 195 | 
                        --->  | 
                    |
| 196 | 
                        - <mod_xml>/usr/lib/jabberd/jsm.so</mod_xml>  | 
                    |
| 197 | 
                        - </load>  | 
                    |
| 198 | 
                        -  | 
                    |
| 199 | 
                        - </service>  | 
                    |
| 200 | 
                        - <!--  | 
                    |
| 201 | 
                        - The <xdb/> component handles all data storage, using the filesystem.  | 
                    |
| 202 | 
                        - Make sure the spool directory defined here exists and has proper  | 
                    |
| 203 | 
                        - permissions.  | 
                    |
| 204 | 
                        - -->  | 
                    |
| 205 | 
                        -  | 
                    |
| 206 | 
                        - <xdb id="xdb">  | 
                    |
| 207 | 
                        - <host/>  | 
                    |
| 208 | 
                        - <load>  | 
                    |
| 209 | 
                        - <xdb_file>/usr/lib/jabberd/xdb_file.so</xdb_file>  | 
                    |
| 210 | 
                        - </load>  | 
                    |
| 211 | 
                        - <xdb_file xmlns="jabber:config:xdb_file">  | 
                    |
| 212 | 
                        - <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>  | 
                    |
| 213 | 
                        - </xdb_file>  | 
                    |
| 214 | 
                        - </xdb>  | 
                    |
| 215 | 
                        -  | 
                    |
| 216 | 
                        - <!--  | 
                    |
| 217 | 
                        - The following service manages incoming client socket connections.  | 
                    |
| 218 | 
                        - There are several items you can set here to optimize performance:  | 
                    |
| 219 | 
                        -  | 
                    |
| 220 | 
                        - * authtime - default is unlimited, but you can set this to  | 
                    |
| 221 | 
                        - limit the amount of time allowed for authentication to be  | 
                    |
| 222 | 
                        - completed, e.g., <authtime>10</authtime> for 10 seconds  | 
                    |
| 223 | 
                        -  | 
                    |
| 224 | 
                        - * heartbeat - default is to not send out heartbeat packets  | 
                    |
| 225 | 
                        - to the clients. This option allows you to specify that  | 
                    |
| 226 | 
                        - you want heartbeats to happen every x seconds. This is  | 
                    |
| 227 | 
                        - useful if you have a lot of dial-up or laptop users who  | 
                    |
| 228 | 
                        - may drop their connection without logging off of jabber.  | 
                    |
| 229 | 
                        - Otherwise the server won't notice that they are offline until  | 
                    |
| 230 | 
                        - someone tries to send a packet to them (and the message is  | 
                    |
| 231 | 
                        - lost). Example: <heartbeat>60</heartbeat>  | 
                    |
| 232 | 
                        -  | 
                    |
| 233 | 
                        - * karma - this is an input/output rate limiting system that  | 
                    |
| 234 | 
                        - the Jabber team came up with to prevent bandwidth hogging.  | 
                    |
| 235 | 
                        - For details about karma, read the io section at the bottom.  | 
                    |
| 236 | 
                        - These are the low settings and apply per connection/socket  | 
                    |
| 237 | 
                        - and can be changed as desired.  | 
                    |
| 238 | 
                        - To disable rate limiting just delete the <karma/> section.  | 
                    |
| 239 | 
                        - -->  | 
                    |
| 240 | 
                        -  | 
                    |
| 241 | 
                        -  | 
                    |
| 242 | 
                        - <service id="c2s">  | 
                    |
| 243 | 
                        - <load>  | 
                    |
| 244 | 
                        - <pthsock_client>/usr/lib/jabberd/pthsock_client.so</pthsock_client>  | 
                    |
| 245 | 
                        - </load>  | 
                    |
| 246 | 
                        - <pthcsock xmlns='jabber:config:pth-csock'>  | 
                    |
| 247 | 
                        - <authtime/>  | 
                    |
| 248 | 
                        - <karma>  | 
                    |
| 249 | 
                        - <init>10</init>  | 
                    |
| 250 | 
                        - <max>10</max>  | 
                    |
| 251 | 
                        - <inc>1</inc>  | 
                    |
| 252 | 
                        - <dec>1</dec>  | 
                    |
| 253 | 
                        - <heartbeat>60</heartbeat>  | 
                    |
| 254 | 
                        - <penalty>-6</penalty>  | 
                    |
| 255 | 
                        - <restore>10</restore>  | 
                    |
| 256 | 
                        - </karma>  | 
                    |
| 257 | 
                        -  | 
                    |
| 258 | 
                        - <!--  | 
                    |
| 259 | 
                        - Use these to listen on particular addresses and/or ports.  | 
                    |
| 260 | 
                        - Example: <ip port="5222">127.0.0.1</ip>  | 
                    |
| 261 | 
                        - Default is to listen on port 5222 on every interface.  | 
                    |
| 262 | 
                        - Remove the <ip/> section to disable non-ssl client connections.  | 
                    |
| 263 | 
                        - -->  | 
                    |
| 264 | 
                        - <ip port="5222"/>  | 
                    |
| 265 | 
                        -  | 
                    |
| 266 | 
                        - <!--  | 
                    |
| 267 | 
                        - The <ssl/> tag acts pretty much like the <ip/> tag,  | 
                    |
| 268 | 
                        - except it defines that SSL is to be used on the  | 
                    |
| 269 | 
                        - ports and IP addresses specified. You must specify  | 
                    |
| 270 | 
                        - an IP address here, or the connections will fail.  | 
                    |
| 271 | 
                        - <ssl port='5223'>127.0.0.1</ssl>  | 
                    |
| 272 | 
                        - <ssl port='5224'>192.168.1.100</ssl>  | 
                    |
| 273 | 
                        - -->  | 
                    |
| 274 | 
                        -  | 
                    |
| 275 | 
                        -  | 
                    |
| 276 | 
                        - </pthcsock>  | 
                    |
| 277 | 
                        - </service>  | 
                    |
| 278 | 
                        -  | 
                    |
| 279 | 
                        - <!--  | 
                    |
| 280 | 
                        - This is the default server error logging component,  | 
                    |
| 281 | 
                        - which copies to a file and to STDERR.  | 
                    |
| 282 | 
                        - -->  | 
                    |
| 283 | 
                        -  | 
                    |
| 284 | 
                        - <log id='elogger'>  | 
                    |
| 285 | 
                        - <host/>  | 
                    |
| 286 | 
                        - <logtype/>  | 
                    |
| 287 | 
                        - <format>%d: [%t] (%h): %s</format>  | 
                    |
| 288 | 
                        - <file>/var/log/jabber/error.log</file>  | 
                    |
| 289 | 
                        - <stderr/>  | 
                    |
| 290 | 
                        - </log>  | 
                    |
| 291 | 
                        -  | 
                    |
| 292 | 
                        - <log id='rlogger'>  | 
                    |
| 293 | 
                        - <host/>  | 
                    |
| 294 | 
                        - <logtype>record</logtype>  | 
                    |
| 295 | 
                        - <format>%d %h %s</format>  | 
                    |
| 296 | 
                        - <file>/var/log/jabber/record.log</file>  | 
                    |
| 297 | 
                        - </log>  | 
                    |
| 298 | 
                        -  | 
                    |
| 299 | 
                        - <service id="dnsrv">  | 
                    |
| 300 | 
                        - <host/>  | 
                    |
| 301 | 
                        - <load>  | 
                    |
| 302 | 
                        - <dnsrv>/usr/lib/jabberd/dnsrv.so</dnsrv>  | 
                    |
| 303 | 
                        - </load>  | 
                    |
| 304 | 
                        - <dnsrv xmlns="jabber:config:dnsrv">  | 
                    |
| 305 | 
                        - <resend service="_jabber._tcp">s2s</resend> <!-- for supporting SRV records -->  | 
                    |
| 306 | 
                        - <resend>s2s</resend>  | 
                    |
| 307 | 
                        - </dnsrv>  | 
                    |
| 308 | 
                        - </service>  | 
                    |
| 309 | 
                        -  | 
                    |
| 310 | 
                        - <!--  | 
                    |
| 311 | 
                        - The following 's2s' config handles server connections and  | 
                    |
| 312 | 
                        - dialback hostname verification. The <legacy/> element is  | 
                    |
| 313 | 
                        - here to enable communication with old 1.0 servers. The  | 
                    |
| 314 | 
                        - karma settings are a little higher here to handle the  | 
                    |
| 315 | 
                        - higher traffic of server-to-server connections (read  | 
                    |
| 316 | 
                        - the io section below for more details, medium settings).  | 
                    |
| 317 | 
                        - -->  | 
                    |
| 318 | 
                        - <service id="s2s">  | 
                    |
| 319 | 
                        - <load>  | 
                    |
| 320 | 
                        - <dialback>/usr/lib/jabberd/dialback.so</dialback>  | 
                    |
| 321 | 
                        - </load>  | 
                    |
| 322 | 
                        - <dialback xmlns='jabber:config:dialback'>  | 
                    |
| 323 | 
                        - <legacy/>  | 
                    |
| 324 | 
                        - <ip port="5269"/>  | 
                    |
| 325 | 
                        - <karma>  | 
                    |
| 326 | 
                        - <init>50</init>  | 
                    |
| 327 | 
                        - <max>50</max>  | 
                    |
| 328 | 
                        - <inc>4</inc>  | 
                    |
| 329 | 
                        - <dec>1</dec>  | 
                    |
| 330 | 
                        - <penalty>-5</penalty>  | 
                    |
| 331 | 
                        - <restore>50</restore>  | 
                    |
| 332 | 
                        - </karma>  | 
                    |
| 333 | 
                        - </dialback>  | 
                    |
| 334 | 
                        - </service>  | 
                    |
| 335 | 
                        -  | 
                    |
| 336 | 
                        - <!--  | 
                    |
| 337 | 
                        - update.jabber.org is long dead but some clients still  | 
                    |
| 338 | 
                        - request update information. In order to avoid errors  | 
                    |
| 339 | 
                        - in the logs, just drop packages for update.jabber.org.  | 
                    |
| 340 | 
                        - -->  | 
                    |
| 341 | 
                        - <service id="update.jabber.org">  | 
                    |
| 342 | 
                        - <host>update.jabber.org</host>  | 
                    |
| 343 | 
                        - <null/>  | 
                    |
| 344 | 
                        - </service>  | 
                    |
| 345 | 
                        -  | 
                    |
| 346 | 
                        - <!--  | 
                    |
| 347 | 
                        - If you identified additional agents in the main <service/>  | 
                    |
| 348 | 
                        - section (see examples above), you'll need to define each  | 
                    |
| 349 | 
                        - of them here using a separate <service/> section for each  | 
                    |
| 350 | 
                        - <agent/> you identified. Note that the <agent/> sections  | 
                    |
| 351 | 
                        - determine what gets shown to clients that connect to your  | 
                    |
| 352 | 
                        - server, whereas the following <service/> sections define  | 
                    |
| 353 | 
                        - these services within the server itself. The following are  | 
                    |
| 354 | 
                        - examples only, you will need to create/modify them to get  | 
                    |
| 355 | 
                        - them working on your Jabber server. See the README files  | 
                    |
| 356 | 
                        - for each agent and/or the server howto for further  | 
                    |
| 357 | 
                        - information/instructions.  | 
                    |
| 358 | 
                        - -->  | 
                    |
| 359 | 
                        -  | 
                    |
| 360 | 
                        - <!-- we're commenting these out, of course :)  | 
                    |
| 361 | 
                        -<service id="jud">  | 
                    |
| 362 | 
                        - <host>jud.localhost</host>  | 
                    |
| 363 | 
                        - <load><jud>/usr/lib/jabberd/jud.so</jud></load>  | 
                    |
| 364 | 
                        - <jud xmlns="jabber:config:jud">  | 
                    |
| 365 | 
                        - <vCard>  | 
                    |
| 366 | 
                        - <FN>Local User Directory</FN>  | 
                    |
| 367 | 
                        - <DESC>This service provides a simple user directory service.</DESC>  | 
                    |
| 368 | 
                        - <URL>http://jud.jabberstudio.org/</URL>  | 
                    |
| 369 | 
                        - </vCard>  | 
                    |
| 370 | 
                        - </jud>  | 
                    |
| 371 | 
                        -</service>  | 
                    |
| 372 | 
                        - -->  | 
                    |
| 373 | 
                        -  | 
                    |
| 374 | 
                        - <io>  | 
                    |
| 375 | 
                        - <!-- Set the default karma for *all* sockets -->  | 
                    |
| 376 | 
                        - <!-- definition of terms:  | 
                    |
| 377 | 
                        -  | 
                    |
| 378 | 
                        - * Avg. Throughput - The number of bytes you can  | 
                    |
| 379 | 
                        - send every second without incuring any penalty.  | 
                    |
| 380 | 
                        -  | 
                    |
| 381 | 
                        - * Burst Allowed - The maximum number of bytes you  | 
                    |
| 382 | 
                        - can send in 2 seconds without incurring any penalty.  | 
                    |
| 383 | 
                        -  | 
                    |
| 384 | 
                        - * Max Sustained Rate - If you send data as fast as  | 
                    |
| 385 | 
                        - you can, you will hit penalty, and will not be  | 
                    |
| 386 | 
                        - able to send for 10 seconds; the max sustained  | 
                    |
| 387 | 
                        - rate is the average rate you can dump data when  | 
                    |
| 388 | 
                        - you are dumping as much data as you can, as fast  | 
                    |
| 389 | 
                        - as you can.  | 
                    |
| 390 | 
                        -  | 
                    |
| 391 | 
                        - * Seconds to Recover from Burst - The amount of time  | 
                    |
| 392 | 
                        - it will take to reach Avg. Throughput capability  | 
                    |
| 393 | 
                        - after sending a max burst of data.  | 
                    |
| 394 | 
                        -  | 
                    |
| 395 | 
                        - * Penalty Length - The length of your penalty is  | 
                    |
| 396 | 
                        - determined according to this formula:  | 
                    |
| 397 | 
                        - abs(penalty) * Heartbeat seconds  | 
                    |
| 398 | 
                        - E.g., a penalty of -5 and heartbeat of 2 will  | 
                    |
| 399 | 
                        - cause your penalty length to be 10 seconds.  | 
                    |
| 400 | 
                        - Note that a penalty CANNOT be less than -100,  | 
                    |
| 401 | 
                        - otherwise strange things might happen.  | 
                    |
| 402 | 
                        -  | 
                    |
| 403 | 
                        - -->  | 
                    |
| 404 | 
                        - <!-- Example of Low Karma Limits  | 
                    |
| 405 | 
                        - Avg. Throughput: 1k-2k/s  | 
                    |
| 406 | 
                        - Burst Allowed To: 5.5k/s  | 
                    |
| 407 | 
                        - Max Sustained Rate: 485b/s  | 
                    |
| 408 | 
                        - Seconds to Recover from Burst: 20  | 
                    |
| 409 | 
                        - Penalty Length: 12 seconds  | 
                    |
| 410 | 
                        - <karma>  | 
                    |
| 411 | 
                        - <heartbeat>2</heartbeat>  | 
                    |
| 412 | 
                        - <init>10</init>  | 
                    |
| 413 | 
                        - <max>10</max>  | 
                    |
| 414 | 
                        - <inc>1</inc>  | 
                    |
| 415 | 
                        - <dec>1</dec>  | 
                    |
| 416 | 
                        - <penalty>-6</penalty>  | 
                    |
| 417 | 
                        - <restore>10</restore>  | 
                    |
| 418 | 
                        - </karma>  | 
                    |
| 419 | 
                        - -->  | 
                    |
| 420 | 
                        -  | 
                    |
| 421 | 
                        - <!--  | 
                    |
| 422 | 
                        - Set rate limits to monitor the number of connection  | 
                    |
| 423 | 
                        - attempts from a single IP, any more than [points]  | 
                    |
| 424 | 
                        - within [time] will engage the limit. This setting  | 
                    |
| 425 | 
                        - applies to all incoming connections to any service,  | 
                    |
| 426 | 
                        - unless otherwise overridden by that service.  | 
                    |
| 427 | 
                        - -->  | 
                    |
| 428 | 
                        -  | 
                    |
| 429 | 
                        - <rate points="5" time="25"/>  | 
                    |
| 430 | 
                        -  | 
                    |
| 431 | 
                        - <!--  | 
                    |
| 432 | 
                        - The following section initializes SSL for top-level I/O.  | 
                    |
| 433 | 
                        - This works only when the server is compiled with openssl!  | 
                    |
| 434 | 
                        - Use IPs here or connections will fail.  | 
                    |
| 435 | 
                        - -->  | 
                    |
| 436 | 
                        -  | 
                    |
| 437 | 
                        - <ssl>  | 
                    |
| 438 | 
                        - <key ip="64.57.168.155">/etc/jabber/gentoo.pem</key>  | 
                    |
| 439 | 
                        - </ssl>  | 
                    |
| 440 | 
                        - <!--  | 
                    |
| 441 | 
                        - The following section is used to allow or deny  | 
                    |
| 442 | 
                        - communications from specified IP networks or  | 
                    |
| 443 | 
                        - addressses. If there is no <allow/> section,  | 
                    |
| 444 | 
                        - then *all* IPs will be allowed to connect. If  | 
                    |
| 445 | 
                        - you allow one block, then only that block may  | 
                    |
| 446 | 
                        - connect. Note that <allow/> is checked before  | 
                    |
| 447 | 
                        - <deny/>, so if a specific address is allowed  | 
                    |
| 448 | 
                        - but the network for that address is denied,  | 
                    |
| 449 | 
                        - then that address will still be denied.  | 
                    |
| 450 | 
                        - -->  | 
                    |
| 451 | 
                        - <!--  | 
                    |
| 452 | 
                        - <allow><ip>127.0.0.0</ip><mask>255.255.255.0</mask></allow>  | 
                    |
| 453 | 
                        - <allow><ip>12.34.56.78</ip></allow>  | 
                    |
| 454 | 
                        - <deny><ip>22.11.44.0</ip><mask>255.255.255.0</mask></deny>  | 
                    |
| 455 | 
                        - -->  | 
                    |
| 456 | 
                        -  | 
                    |
| 457 | 
                        - </io>  | 
                    |
| 458 | 
                        -  | 
                    |
| 459 | 
                        - <!--  | 
                    |
| 460 | 
                        - This specifies the file to store the pid of the process in.  | 
                    |
| 461 | 
                        - -->  | 
                    |
| 462 | 
                        -  | 
                    |
| 463 | 
                        - <pidfile>/var/run/jabber.pid</pidfile>  | 
                    |
| 464 | 
                        -  | 
                    |
| 465 | 
                        -</jabber>  | 
                    
| ... | ... | 
                      @@ -1,260 +0,0 @@  | 
                  
| 1 | 
                        -diff -ru c2sorig/authreg.c c2s/authreg.c  | 
                    |
| 2 | 
                        ---- c2sorig/authreg.c Mon Nov 22 15:53:34 2004  | 
                    |
| 3 | 
                        -+++ c2s/authreg.c Mon Nov 22 20:06:25 2004  | 
                    |
| 4 | 
                        -@@ -623,7 +623,7 @@  | 
                    |
| 5 | 
                        - log_write(c2s->log, LOG_NOTICE, "[%d] created user: user=%s; realm=%s", sess->s->tag, username, sess->realm);  | 
                    |
| 6 | 
                        -  | 
                    |
| 7 | 
                        - /* extract the password */  | 
                    |
| 8 | 
                        -- snprintf(password, 1024, "%.*s", NAD_CDATA_L(nad, elem), NAD_CDATA(nad, elem));  | 
                    |
| 9 | 
                        -+ snprintf(password, 257, "%.*s", NAD_CDATA_L(nad, elem), NAD_CDATA(nad, elem));  | 
                    |
| 10 | 
                        -  | 
                    |
| 11 | 
                        - /* change it */  | 
                    |
| 12 | 
                        - if((c2s->ar->set_password)(c2s->ar, username, sess->realm, password) != 0)  | 
                    |
| 13 | 
                        -diff -ru c2sorig/authreg_mysql.c c2s/authreg_mysql.c  | 
                    |
| 14 | 
                        ---- c2sorig/authreg_mysql.c Mon Nov 22 15:53:34 2004  | 
                    |
| 15 | 
                        -+++ c2s/authreg_mysql.c Mon Nov 22 16:55:37 2004  | 
                    |
| 16 | 
                        -@@ -24,6 +24,10 @@  | 
                    |
| 17 | 
                        -  | 
                    |
| 18 | 
                        - #ifdef STORAGE_MYSQL  | 
                    |
| 19 | 
                        -  | 
                    |
| 20 | 
                        -+#define MYSQL_LU 1024 /* maximum length of username - should correspond to field length */  | 
                    |
| 21 | 
                        -+#define MYSQL_LR 256 /* maximum length of realm - should correspond to field length */  | 
                    |
| 22 | 
                        -+#define MYSQL_LP 256 /* maximum length of password - should correspond to field length */  | 
                    |
| 23 | 
                        -+  | 
                    |
| 24 | 
                        - #include <mysql.h>  | 
                    |
| 25 | 
                        -  | 
                    |
| 26 | 
                        - typedef struct mysqlcontext_st {
                       | 
                    |
| 27 | 
                        -@@ -42,7 +46,8 @@  | 
                    |
| 28 | 
                        - static MYSQL_RES *_ar_mysql_get_user_tuple(authreg_t ar, char *username, char *realm) {
                       | 
                    |
| 29 | 
                        - mysqlcontext_t ctx = (mysqlcontext_t) ar->private;  | 
                    |
| 30 | 
                        - MYSQL *conn = ctx->conn;  | 
                    |
| 31 | 
                        -- char euser[2049], erealm[2049], sql[5121]; /* query(1024) + euser(2048) + erealm(2048) + \0(1) */  | 
                    |
| 32 | 
                        -+ char iuser[MYSQL_LU+1], irealm[MYSQL_LR+1];  | 
                    |
| 33 | 
                        -+ char euser[MYSQL_LU*2+1], erealm[MYSQL_LR*2+1], sql[1024 + MYSQL_LU*2 + MYSQL_LR*2 + 1]; /* query(1024) + euser + erealm + \0(1) */  | 
                    |
| 34 | 
                        - MYSQL_RES *res;  | 
                    |
| 35 | 
                        -  | 
                    |
| 36 | 
                        -     if(mysql_ping(conn) != 0) {
                       | 
                    |
| 37 | 
                        -@@ -50,8 +55,11 @@  | 
                    |
| 38 | 
                        - return NULL;  | 
                    |
| 39 | 
                        - }  | 
                    |
| 40 | 
                        -  | 
                    |
| 41 | 
                        -- mysql_real_escape_string(conn, euser, username, strlen(username));  | 
                    |
| 42 | 
                        -- mysql_real_escape_string(conn, erealm, realm, strlen(realm));  | 
                    |
| 43 | 
                        -+ snprintf(iuser, MYSQL_LU+1, "%s", username);  | 
                    |
| 44 | 
                        -+ snprintf(irealm, MYSQL_LR+1, "%s", realm);  | 
                    |
| 45 | 
                        -+  | 
                    |
| 46 | 
                        -+ mysql_real_escape_string(conn, euser, iuser, strlen(iuser));  | 
                    |
| 47 | 
                        -+ mysql_real_escape_string(conn, erealm, irealm, strlen(irealm));  | 
                    |
| 48 | 
                        -  | 
                    |
| 49 | 
                        - sprintf(sql, ctx->sql_select, euser, erealm);  | 
                    |
| 50 | 
                        -  | 
                    |
| 51 | 
                        -@@ -127,15 +135,21 @@  | 
                    |
| 52 | 
                        - static int _ar_mysql_set_password(authreg_t ar, char *username, char *realm, char password[257]) {
                       | 
                    |
| 53 | 
                        - mysqlcontext_t ctx = (mysqlcontext_t) ar->private;  | 
                    |
| 54 | 
                        - MYSQL *conn = ctx->conn;  | 
                    |
| 55 | 
                        -- char euser[2049], erealm[2049], epass[513], sql[5633]; /* query(1024) + euser(2048) + erealm(2048) + epass(512) + \0(1) */  | 
                    |
| 56 | 
                        -+ char iuser[MYSQL_LU+1], irealm[MYSQL_LR+1];  | 
                    |
| 57 | 
                        -+ char euser[MYSQL_LU*2+1], erealm[MYSQL_LR*2+1], epass[513], sql[1024+MYSQL_LU*2+MYSQL_LR*2+512+1]; /* query(1024) + euser + erealm + epass(512) + \0(1) */  | 
                    |
| 58 | 
                        -  | 
                    |
| 59 | 
                        -     if(mysql_ping(conn) != 0) {
                       | 
                    |
| 60 | 
                        - log_write(ar->c2s->log, LOG_ERR, "mysql: connection to database lost");  | 
                    |
| 61 | 
                        - return 1;  | 
                    |
| 62 | 
                        - }  | 
                    |
| 63 | 
                        -  | 
                    |
| 64 | 
                        -- mysql_real_escape_string(conn, euser, username, strlen(username));  | 
                    |
| 65 | 
                        -- mysql_real_escape_string(conn, erealm, realm, strlen(realm));  | 
                    |
| 66 | 
                        -+ snprintf(iuser, MYSQL_LU+1, "%s", username);  | 
                    |
| 67 | 
                        -+ snprintf(irealm, MYSQL_LR+1, "%s", realm);  | 
                    |
| 68 | 
                        -+  | 
                    |
| 69 | 
                        -+ password[256]= '\0';  | 
                    |
| 70 | 
                        -+  | 
                    |
| 71 | 
                        -+ mysql_real_escape_string(conn, euser, iuser, strlen(iuser));  | 
                    |
| 72 | 
                        -+ mysql_real_escape_string(conn, erealm, irealm, strlen(irealm));  | 
                    |
| 73 | 
                        - mysql_real_escape_string(conn, epass, password, strlen(password));  | 
                    |
| 74 | 
                        -  | 
                    |
| 75 | 
                        - sprintf(sql, ctx->sql_setpassword, epass, euser, erealm);  | 
                    |
| 76 | 
                        -@@ -195,15 +209,19 @@  | 
                    |
| 77 | 
                        - static int _ar_mysql_set_zerok(authreg_t ar, char *username, char *realm, char hash[41], char token[11], int sequence) {
                       | 
                    |
| 78 | 
                        - mysqlcontext_t ctx = (mysqlcontext_t) ar->private;  | 
                    |
| 79 | 
                        - MYSQL *conn = ctx->conn;  | 
                    |
| 80 | 
                        -- char euser[2049], erealm[2049], ehash[81], etoken[21], sql[5233]; /* query(1024) + euser(2048) + erealm(2048) + ehash(80) + etoken(20) + sequence(12) + \0(1) */  | 
                    |
| 81 | 
                        -+ char iuser[MYSQL_LU+1], irealm[MYSQL_LR+1];  | 
                    |
| 82 | 
                        -+ char euser[MYSQL_LU*2+1], erealm[MYSQL_LR*2+1], ehash[81], etoken[21], sql[1024+MYSQL_LU*2+MYSQL_LR*2+80+20+12+1]; /* query(1024) + euser + erealm + ehash(80) + etoken(20) + sequence(12) + \0(1) */  | 
                    |
| 83 | 
                        -  | 
                    |
| 84 | 
                        -     if(mysql_ping(conn) != 0) {
                       | 
                    |
| 85 | 
                        - log_write(ar->c2s->log, LOG_ERR, "mysql: connection to database lost");  | 
                    |
| 86 | 
                        - return 1;  | 
                    |
| 87 | 
                        - }  | 
                    |
| 88 | 
                        -  | 
                    |
| 89 | 
                        -- mysql_real_escape_string(conn, euser, username, strlen(username));  | 
                    |
| 90 | 
                        -- mysql_real_escape_string(conn, erealm, realm, strlen(realm));  | 
                    |
| 91 | 
                        -+ snprintf(iuser, MYSQL_LU+1, "%s", username);  | 
                    |
| 92 | 
                        -+ snprintf(irealm, MYSQL_LR+1, "%s", realm);  | 
                    |
| 93 | 
                        -+  | 
                    |
| 94 | 
                        -+ mysql_real_escape_string(conn, euser, iuser, strlen(iuser));  | 
                    |
| 95 | 
                        -+ mysql_real_escape_string(conn, erealm, irealm, strlen(irealm));  | 
                    |
| 96 | 
                        - mysql_real_escape_string(conn, ehash, hash, strlen(hash));  | 
                    |
| 97 | 
                        - mysql_real_escape_string(conn, etoken, token, strlen(token));  | 
                    |
| 98 | 
                        -  | 
                    |
| 99 | 
                        -@@ -222,7 +240,8 @@  | 
                    |
| 100 | 
                        - static int _ar_mysql_create_user(authreg_t ar, char *username, char *realm) {
                       | 
                    |
| 101 | 
                        - mysqlcontext_t ctx = (mysqlcontext_t) ar->private;  | 
                    |
| 102 | 
                        - MYSQL *conn = ctx->conn;  | 
                    |
| 103 | 
                        -- char euser[2049], erealm[2049], sql[5121]; /* query(1024) + euser(2048) + erealm(2048) + \0(1) */  | 
                    |
| 104 | 
                        -+ char iuser[MYSQL_LU+1], irealm[MYSQL_LR+1];  | 
                    |
| 105 | 
                        -+ char euser[MYSQL_LU*2+1], erealm[MYSQL_LR*2+1], sql[1024+MYSQL_LU*2+MYSQL_LR*2+1]; /* query(1024) + euser + erealm + \0(1) */  | 
                    |
| 106 | 
                        - MYSQL_RES *res = _ar_mysql_get_user_tuple(ar, username, realm);  | 
                    |
| 107 | 
                        -  | 
                    |
| 108 | 
                        -     if(res != NULL) {
                       | 
                    |
| 109 | 
                        -@@ -237,8 +256,11 @@  | 
                    |
| 110 | 
                        - return 1;  | 
                    |
| 111 | 
                        - }  | 
                    |
| 112 | 
                        -  | 
                    |
| 113 | 
                        -- mysql_real_escape_string(conn, euser, username, strlen(username));  | 
                    |
| 114 | 
                        -- mysql_real_escape_string(conn, erealm, realm, strlen(realm));  | 
                    |
| 115 | 
                        -+ snprintf(iuser, MYSQL_LU+1, "%s", username);  | 
                    |
| 116 | 
                        -+ snprintf(irealm, MYSQL_LR+1, "%s", realm);  | 
                    |
| 117 | 
                        -+  | 
                    |
| 118 | 
                        -+ mysql_real_escape_string(conn, euser, iuser, strlen(iuser));  | 
                    |
| 119 | 
                        -+ mysql_real_escape_string(conn, erealm, irealm, strlen(irealm));  | 
                    |
| 120 | 
                        -  | 
                    |
| 121 | 
                        - sprintf(sql, ctx->sql_create, euser, erealm);  | 
                    |
| 122 | 
                        -  | 
                    |
| 123 | 
                        -@@ -255,15 +277,19 @@  | 
                    |
| 124 | 
                        - static int _ar_mysql_delete_user(authreg_t ar, char *username, char *realm) {
                       | 
                    |
| 125 | 
                        - mysqlcontext_t ctx = (mysqlcontext_t) ar->private;  | 
                    |
| 126 | 
                        - MYSQL *conn = ctx->conn;  | 
                    |
| 127 | 
                        -- char euser[2049], erealm[2049], sql[5121]; /* query(1024) + euser(2048) + erealm(2048) + \0(1) */  | 
                    |
| 128 | 
                        -+ char iuser[MYSQL_LU+1], irealm[MYSQL_LR+1];  | 
                    |
| 129 | 
                        -+ char euser[MYSQL_LU*2+1], erealm[MYSQL_LR*2+1], sql[1024+MYSQL_LU*2+MYSQL_LR*2+1]; /* query(1024) + euser + erealm + \0(1) */  | 
                    |
| 130 | 
                        -  | 
                    |
| 131 | 
                        -     if(mysql_ping(conn) != 0) {
                       | 
                    |
| 132 | 
                        - log_write(ar->c2s->log, LOG_ERR, "mysql: connection to database lost");  | 
                    |
| 133 | 
                        - return 1;  | 
                    |
| 134 | 
                        - }  | 
                    |
| 135 | 
                        -  | 
                    |
| 136 | 
                        -- mysql_real_escape_string(conn, euser, username, strlen(username));  | 
                    |
| 137 | 
                        -- mysql_real_escape_string(conn, erealm, realm, strlen(realm));  | 
                    |
| 138 | 
                        -+ snprintf(iuser, MYSQL_LU+1, "%s", username);  | 
                    |
| 139 | 
                        -+ snprintf(irealm, MYSQL_LR+1, "%s", realm);  | 
                    |
| 140 | 
                        -+  | 
                    |
| 141 | 
                        -+ mysql_real_escape_string(conn, euser, iuser, strlen(iuser));  | 
                    |
| 142 | 
                        -+ mysql_real_escape_string(conn, erealm, irealm, strlen(irealm));  | 
                    |
| 143 | 
                        -  | 
                    |
| 144 | 
                        - sprintf(sql, ctx->sql_delete, euser, erealm);  | 
                    |
| 145 | 
                        -  | 
                    |
| 146 | 
                        -diff -ru c2sorig/authreg_pgsql.c c2s/authreg_pgsql.c  | 
                    |
| 147 | 
                        ---- c2sorig/authreg_pgsql.c Mon Nov 22 15:53:34 2004  | 
                    |
| 148 | 
                        -+++ c2s/authreg_pgsql.c Mon Nov 22 16:52:20 2004  | 
                    |
| 149 | 
                        -@@ -26,6 +26,10 @@  | 
                    |
| 150 | 
                        -  | 
                    |
| 151 | 
                        - #include <libpq-fe.h>  | 
                    |
| 152 | 
                        -  | 
                    |
| 153 | 
                        -+#define PGSQL_LU 1024 /* maximum length of username - should correspond to field length */  | 
                    |
| 154 | 
                        -+#define PGSQL_LR 256 /* maximum length of realm - should correspond to field length */  | 
                    |
| 155 | 
                        -+#define PGSQL_LP 256 /* maximum length of password - should correspond to field length */  | 
                    |
| 156 | 
                        -+  | 
                    |
| 157 | 
                        - typedef struct pgsqlcontext_st {
                       | 
                    |
| 158 | 
                        - PGconn * conn;  | 
                    |
| 159 | 
                        - char * sql_create;  | 
                    |
| 160 | 
                        -@@ -42,11 +46,16 @@  | 
                    |
| 161 | 
                        - static PGresult *_ar_pgsql_get_user_tuple(authreg_t ar, char *username, char *realm) {
                       | 
                    |
| 162 | 
                        - pgsqlcontext_t ctx = (pgsqlcontext_t) ar->private;  | 
                    |
| 163 | 
                        - PGconn *conn = ctx->conn;  | 
                    |
| 164 | 
                        -- char euser[2049], erealm[2049], sql[5121]; /* query(1024) + euser(2048) + erealm(2048) + \0(1) */  | 
                    |
| 165 | 
                        -+  | 
                    |
| 166 | 
                        -+ char iuser[PGSQL_LU+1], irealm[PGSQL_LR+1];  | 
                    |
| 167 | 
                        -+ char euser[PGSQL_LU*2+1], erealm[PGSQL_LR*2+1], sql[1024+PGSQL_LU*2+PGSQL_LR*2+1]; /* query(1024) + euser + erealm + \0(1) */  | 
                    |
| 168 | 
                        - PGresult *res;  | 
                    |
| 169 | 
                        -  | 
                    |
| 170 | 
                        -- PQescapeString(euser, username, strlen(username));  | 
                    |
| 171 | 
                        -- PQescapeString(erealm, realm, strlen(realm));  | 
                    |
| 172 | 
                        -+ snprintf(iuser, PGSQL_LU+1, "%s", username);  | 
                    |
| 173 | 
                        -+ snprintf(irealm, PGSQL_LR+1, "%s", realm);  | 
                    |
| 174 | 
                        -+  | 
                    |
| 175 | 
                        -+ PQescapeString(euser, iuser, strlen(iuser));  | 
                    |
| 176 | 
                        -+ PQescapeString(erealm, irealm, strlen(irealm));  | 
                    |
| 177 | 
                        -  | 
                    |
| 178 | 
                        - sprintf(sql, ctx->sql_select, euser, erealm);  | 
                    |
| 179 | 
                        -  | 
                    |
| 180 | 
                        -@@ -114,11 +123,15 @@  | 
                    |
| 181 | 
                        - static int _ar_pgsql_set_password(authreg_t ar, char *username, char *realm, char password[257]) {
                       | 
                    |
| 182 | 
                        - pgsqlcontext_t ctx = (pgsqlcontext_t) ar->private;  | 
                    |
| 183 | 
                        - PGconn *conn = ctx->conn;  | 
                    |
| 184 | 
                        -- char euser[2049], erealm[2049], epass[513], sql[5633]; /* query(1024) + euser(2048) + erealm(2048) + epass(512) + \0(1) */  | 
                    |
| 185 | 
                        -+ char iuser[PGSQL_LU+1], irealm[PGSQL_LR+1];  | 
                    |
| 186 | 
                        -+ char euser[PGSQL_LU*2+1], erealm[PGSQL_LR*2+1], epass[513], sql[1024+PGSQL_LU*2+PGSQL_LR*2+512+1]; /* query(1024) + euser + erealm + epass(512) + \0(1) */  | 
                    |
| 187 | 
                        - PGresult *res;  | 
                    |
| 188 | 
                        -  | 
                    |
| 189 | 
                        -- PQescapeString(euser, username, strlen(username));  | 
                    |
| 190 | 
                        -- PQescapeString(erealm, realm, strlen(realm));  | 
                    |
| 191 | 
                        -+ snprintf(iuser, PGSQL_LU+1, "%s", username);  | 
                    |
| 192 | 
                        -+ snprintf(irealm, PGSQL_LR+1, "%s", realm);  | 
                    |
| 193 | 
                        -+  | 
                    |
| 194 | 
                        -+ PQescapeString(euser, iuser, strlen(iuser));  | 
                    |
| 195 | 
                        -+ PQescapeString(erealm, irealm, strlen(irealm));  | 
                    |
| 196 | 
                        - PQescapeString(epass, password, strlen(password));  | 
                    |
| 197 | 
                        -  | 
                    |
| 198 | 
                        - sprintf(sql, ctx->sql_setpassword, epass, euser, erealm);  | 
                    |
| 199 | 
                        -@@ -177,11 +190,15 @@  | 
                    |
| 200 | 
                        - static int _ar_pgsql_set_zerok(authreg_t ar, char *username, char *realm, char hash[41], char token[11], int sequence) {
                       | 
                    |
| 201 | 
                        - pgsqlcontext_t ctx = (pgsqlcontext_t) ar->private;  | 
                    |
| 202 | 
                        - PGconn *conn = ctx->conn;  | 
                    |
| 203 | 
                        -- char euser[2049], erealm[2049], ehash[81], etoken[21], sql[5233]; /* query(1024) + euser(2048) + erealm(2048) + ehash(80) + etoken(20) + sequence(12) + \0(1) */  | 
                    |
| 204 | 
                        -+ char iuser[PGSQL_LU+1], irealm[PGSQL_LR+1];  | 
                    |
| 205 | 
                        -+ char euser[PGSQL_LU*2+1], erealm[PGSQL_LR*2+1], ehash[81], etoken[21], sql[1024 + PGSQL_LU*2 + PGSQL_LR*2 + 80 + 20 + 12 + 1]; /* query(1024) + euser + erealm + ehash(80) + etoken(20) + sequence(12) + \0(1) */  | 
                    |
| 206 | 
                        - PGresult *res;  | 
                    |
| 207 | 
                        -  | 
                    |
| 208 | 
                        -- PQescapeString(euser, username, strlen(username));  | 
                    |
| 209 | 
                        -- PQescapeString(erealm, realm, strlen(realm));  | 
                    |
| 210 | 
                        -+ snprintf(iuser, PGSQL_LU+1, "%s", username);  | 
                    |
| 211 | 
                        -+ snprintf(irealm, PGSQL_LR+1, "%s", realm);  | 
                    |
| 212 | 
                        -+  | 
                    |
| 213 | 
                        -+ PQescapeString(euser, iuser, strlen(iuser));  | 
                    |
| 214 | 
                        -+ PQescapeString(erealm, irealm, strlen(irealm));  | 
                    |
| 215 | 
                        - PQescapeString(ehash, hash, strlen(hash));  | 
                    |
| 216 | 
                        - PQescapeString(etoken, token, strlen(token));  | 
                    |
| 217 | 
                        -  | 
                    |
| 218 | 
                        -@@ -210,7 +227,8 @@  | 
                    |
| 219 | 
                        - static int _ar_pgsql_create_user(authreg_t ar, char *username, char *realm) {
                       | 
                    |
| 220 | 
                        - pgsqlcontext_t ctx = (pgsqlcontext_t) ar->private;  | 
                    |
| 221 | 
                        - PGconn *conn = ctx->conn;  | 
                    |
| 222 | 
                        -- char euser[2049], erealm[2049], sql[5121]; /* query(1024) + euser(2048) + erealm(2048) + \0(1) */  | 
                    |
| 223 | 
                        -+ char iuser[PGSQL_LU+1], irealm[PGSQL_LR+1];  | 
                    |
| 224 | 
                        -+ char euser[PGSQL_LU*2+1], erealm[PGSQL_LR*2+1], sql[1024+PGSQL_LU*2+PGSQL_LR*2+1]; /* query(1024) + euser + erealm + \0(1) */  | 
                    |
| 225 | 
                        - PGresult *res;  | 
                    |
| 226 | 
                        -  | 
                    |
| 227 | 
                        - res = _ar_pgsql_get_user_tuple(ar, username, realm);  | 
                    |
| 228 | 
                        -@@ -221,8 +239,11 @@  | 
                    |
| 229 | 
                        -  | 
                    |
| 230 | 
                        - PQclear(res);  | 
                    |
| 231 | 
                        -  | 
                    |
| 232 | 
                        -- PQescapeString(euser, username, strlen(username));  | 
                    |
| 233 | 
                        -- PQescapeString(erealm, realm, strlen(realm));  | 
                    |
| 234 | 
                        -+ snprintf(iuser, PGSQL_LU+1, "%s", username);  | 
                    |
| 235 | 
                        -+ snprintf(irealm, PGSQL_LR+1, "%s", realm);  | 
                    |
| 236 | 
                        -+  | 
                    |
| 237 | 
                        -+ PQescapeString(euser, iuser, strlen(iuser));  | 
                    |
| 238 | 
                        -+ PQescapeString(erealm, irealm, strlen(irealm));  | 
                    |
| 239 | 
                        -  | 
                    |
| 240 | 
                        - sprintf(sql, ctx->sql_create, euser, erealm);  | 
                    |
| 241 | 
                        -  | 
                    |
| 242 | 
                        -@@ -249,11 +270,15 @@  | 
                    |
| 243 | 
                        - static int _ar_pgsql_delete_user(authreg_t ar, char *username, char *realm) {
                       | 
                    |
| 244 | 
                        - pgsqlcontext_t ctx = (pgsqlcontext_t) ar->private;  | 
                    |
| 245 | 
                        - PGconn *conn = ctx->conn;  | 
                    |
| 246 | 
                        -- char euser[2049], erealm[2049], sql[5121]; /* query(1024) + euser(2048) + erealm(2048) + \0(1) */  | 
                    |
| 247 | 
                        -+ char iuser[PGSQL_LU+1], irealm[PGSQL_LR+1];  | 
                    |
| 248 | 
                        -+ char euser[PGSQL_LU*2+1], erealm[PGSQL_LR*2+1], sql[1024+PGSQL_LU*2+PGSQL_LR*2+1]; /* query(1024) + euser + erealm + \0(1) */  | 
                    |
| 249 | 
                        - PGresult *res;  | 
                    |
| 250 | 
                        -  | 
                    |
| 251 | 
                        -- PQescapeString(euser, username, strlen(username));  | 
                    |
| 252 | 
                        -- PQescapeString(erealm, realm, strlen(realm));  | 
                    |
| 253 | 
                        -+ snprintf(iuser, PGSQL_LU+1, "%s", username);  | 
                    |
| 254 | 
                        -+ snprintf(irealm, PGSQL_LR+1, "%s", realm);  | 
                    |
| 255 | 
                        -+  | 
                    |
| 256 | 
                        -+ PQescapeString(euser, iuser, strlen(iuser));  | 
                    |
| 257 | 
                        -+ PQescapeString(erealm, irealm, strlen(irealm));  | 
                    |
| 258 | 
                        -  | 
                    |
| 259 | 
                        - sprintf(sql, ctx->sql_delete, euser, erealm);  | 
                    |
| 260 | 
                        -  | 
                    
| ... | ... | 
                      @@ -1,25 +0,0 @@  | 
                  
| 1 | 
                        -#!/bin/bash  | 
                    |
| 2 | 
                        -  | 
                    |
| 3 | 
                        -######  | 
                    |
| 4 | 
                        -#  | 
                    |
| 5 | 
                        -# Generate a certificate and key with no passphrase.  | 
                    |
| 6 | 
                        -#  | 
                    |
| 7 | 
                        -######  | 
                    |
| 8 | 
                        -  | 
                    |
| 9 | 
                        -OPENSSL=/usr/bin/openssl  | 
                    |
| 10 | 
                        -  | 
                    |
| 11 | 
                        -## Remove existing temporary private key  | 
                    |
| 12 | 
                        -test -f /tmp/privkey.pem && rm -f /tmp/privkey.pem  | 
                    |
| 13 | 
                        -## Remove existing private key  | 
                    |
| 14 | 
                        -test -f /etc/jabberd/gentoo.pem && rm -f /etc/jabberd/gentoo.pem  | 
                    |
| 15 | 
                        -## This generates the cert and key  | 
                    |
| 16 | 
                        -$OPENSSL req -new -x509 -newkey rsa:2048 -keyout /tmp/privkey.pem -out /etc/jabberd/gentoo.pem  | 
                    |
| 17 | 
                        -## This will remove the passphrase  | 
                    |
| 18 | 
                        -$OPENSSL rsa -in /tmp/privkey.pem -out /tmp/privkey.pem  | 
                    |
| 19 | 
                        -## Put it all together  | 
                    |
| 20 | 
                        -cat /tmp/privkey.pem >> /etc/jabberd/gentoo.pem  | 
                    |
| 21 | 
                        -## Cleanup  | 
                    |
| 22 | 
                        -rm -f /tmp/privkey.pem  | 
                    |
| 23 | 
                        -echo ""  | 
                    |
| 24 | 
                        -echo "Your new key is /etc/jabberd/gentoo.pem"  | 
                    |
| 25 | 
                        -echo ""  | 
                    
| ... | ... | 
                      @@ -1,21 +0,0 @@  | 
                  
| 1 | 
                        -#!/bin/bash  | 
                    |
| 2 | 
                        -  | 
                    |
| 3 | 
                        -######  | 
                    |
| 4 | 
                        -#  | 
                    |
| 5 | 
                        -# Generate a certificate and key with no passphrase.  | 
                    |
| 6 | 
                        -#  | 
                    |
| 7 | 
                        -######  | 
                    |
| 8 | 
                        -  | 
                    |
| 9 | 
                        -OPENSSL=/usr/bin/openssl  | 
                    |
| 10 | 
                        -  | 
                    |
| 11 | 
                        -## This generates the cert and key  | 
                    |
| 12 | 
                        -$OPENSSL req -new -x509 -newkey rsa:1024 -keyout /tmp/privkey.pem -out /etc/jabber/gentoo.pem  | 
                    |
| 13 | 
                        -## This will remove the passphrase  | 
                    |
| 14 | 
                        -$OPENSSL rsa -in /tmp/privkey.pem -out /tmp/privkey.pem  | 
                    |
| 15 | 
                        -## Put it all together  | 
                    |
| 16 | 
                        -cat /tmp/privkey.pem >> /etc/jabber/gentoo.pem  | 
                    |
| 17 | 
                        -## Cleanup  | 
                    |
| 18 | 
                        -rm /tmp/privkey.pem  | 
                    |
| 19 | 
                        -echo ""  | 
                    |
| 20 | 
                        -echo "Your new key is /etc/jabber/gentoo.pem"  | 
                    |
| 21 | 
                        -echo ""  | 
                    
| ... | ... | 
                      @@ -1,35 +0,0 @@  | 
                  
| 1 | 
                        -<xdb id="xdb_ldap">  | 
                    |
| 2 | 
                        - <ns>jabber:iq:auth:0k</ns>  | 
                    |
| 3 | 
                        - <ns>jabber:iq:auth</ns>  | 
                    |
| 4 | 
                        - <ns>vcard-temp</ns>  | 
                    |
| 5 | 
                        - <ns>jabber:jud:users</ns>  | 
                    |
| 6 | 
                        - <host/>  | 
                    |
| 7 | 
                        - <load>  | 
                    |
| 8 | 
                        - <xdb_ldap>/usr/lib/jabberd/xdb_ldap.so</xdb_ldap>  | 
                    |
| 9 | 
                        - </load>  | 
                    |
| 10 | 
                        - <xdb_ldap xmlns="jabberd:xdb_ldap:config">  | 
                    |
| 11 | 
                        - <connection>  | 
                    |
| 12 | 
                        - <host>localhost</host>  | 
                    |
| 13 | 
                        - <port></port>  | 
                    |
| 14 | 
                        - <rootdn>o=idx-jabber,c=fr</rootdn>  | 
                    |
| 15 | 
                        - <uniqattr>cn</uniqattr>  | 
                    |
| 16 | 
                        - <binddn>cn=jabberadmin, o=idx-jabber, c=fr</binddn>  | 
                    |
| 17 | 
                        - <bindpw>secret</bindpw>  | 
                    |
| 18 | 
                        - </connection>  | 
                    |
| 19 | 
                        - <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>  | 
                    |
| 20 | 
                        - </xdb_ldap>  | 
                    |
| 21 | 
                        -</xdb>  | 
                    |
| 22 | 
                        -<xdb id="xdb_other">  | 
                    |
| 23 | 
                        - <ns>jabber:iq:roster</ns>  | 
                    |
| 24 | 
                        - <ns>jabber:iq:private</ns>  | 
                    |
| 25 | 
                        - <ns>jabber:iq:register</ns>  | 
                    |
| 26 | 
                        - <ns>jabber:iq:filter</ns>  | 
                    |
| 27 | 
                        - <ns>jabber:x:offline</ns>  | 
                    |
| 28 | 
                        - <host/>  | 
                    |
| 29 | 
                        - <load>  | 
                    |
| 30 | 
                        - <xdb_file>./xdb_file/xdb_file.so</xdb_file>  | 
                    |
| 31 | 
                        - </load>  | 
                    |
| 32 | 
                        - <xdb_file xmlns="jabber:config:xdb_file">  | 
                    |
| 33 | 
                        - <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>  | 
                    |
| 34 | 
                        - </xdb_file>  | 
                    |
| 35 | 
                        -</xdb>  | 
                    
| ... | ... | 
                      @@ -1,17 +0,0 @@  | 
                  
| 1 | 
                        ---- error.c.old 2004-03-20 14:39:57.985636816 +0100  | 
                    |
| 2 | 
                        -+++ error.c 2004-03-20 14:40:42.025941672 +0100  | 
                    |
| 3 | 
                        -@@ -71,7 +71,13 @@  | 
                    |
| 4 | 
                        - len += sprintf(&(buf->data[len]), "<stream:error xmlns:stream='" uri_STREAMS "'><%s xmlns='" uri_STREAM_ERR "'/><text xmlns='" uri_STREAM_ERR "'>%s</text></stream:error>", _stream_errors[err], text);  | 
                    |
| 5 | 
                        -  | 
                    |
| 6 | 
                        - if(s->state < state_STREAM)  | 
                    |
| 7 | 
                        -- len += sprintf(&(buf->data[len]), "</stream:stream>");  | 
                    |
| 8 | 
                        -+	{
                       | 
                    |
| 9 | 
                        -+ char *streamend= "</stream:stream>";  | 
                    |
| 10 | 
                        -+	 printf ("About to write %d bytes\n", strlen (streamend)); 
                       | 
                    |
| 11 | 
                        -+ // len += sprintf(&(buf->data[len]), "</stream:stream>");  | 
                    |
| 12 | 
                        -+ memcpy (&(buf->data[len]), streamend, strlen (streamend));  | 
                    |
| 13 | 
                        -+ len += strlen (streamend);  | 
                    |
| 14 | 
                        -+ }  | 
                    |
| 15 | 
                        -  | 
                    |
| 16 | 
                        - assert(len == buf->len);  | 
                    |
| 17 | 
                        -  | 
                    
| ... | ... | 
                      @@ -1,183 +0,0 @@  | 
                  
| 1 | 
                        -# Copyright 1999-2005 Gentoo Foundation  | 
                    |
| 2 | 
                        -# Distributed under the terms of the GNU General Public License v2  | 
                    |
| 3 | 
                        -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r5.ebuild,v 1.5 2005/11/24 16:50:10 blubb Exp $  | 
                    |
| 4 | 
                        -  | 
                    |
| 5 | 
                        -inherit eutils multilib  | 
                    |
| 6 | 
                        -  | 
                    |
| 7 | 
                        -S="${WORKDIR}/jabberd-${PV}"
                       | 
                    |
| 8 | 
                        -DESCRIPTION="Open Source Jabber Server"  | 
                    |
| 9 | 
                        -HOMEPAGE="http://www.jabber.org"  | 
                    |
| 10 | 
                        -SRC_URI="http://jabberd.jabberstudio.org/1.4/dist/jabberd-${PV}.tar.gz
                       | 
                    |
| 11 | 
                        - http://www.gentoo-pt.org/~humpback/jabberd-1.4.3-extexpat.diff  | 
                    |
| 12 | 
                        - ldap? ( http://www.jabberstudio.org/files/xdb_ldap/xdb_ldap-1.0.tar.gz )"  | 
                    |
| 13 | 
                        -  | 
                    |
| 14 | 
                        -SLOT="0"  | 
                    |
| 15 | 
                        -LICENSE="GPL-2"  | 
                    |
| 16 | 
                        -KEYWORDS="x86 ~amd64"  | 
                    |
| 17 | 
                        -IUSE="ssl ldap ipv6"  | 
                    |
| 18 | 
                        -  | 
                    |
| 19 | 
                        -DEPEND="!net-im/jabber-server  | 
                    |
| 20 | 
                        - >=dev-libs/pth-1.4.0  | 
                    |
| 21 | 
                        - dev-libs/expat  | 
                    |
| 22 | 
                        - ssl? ( >=dev-libs/openssl-0.9.6i )  | 
                    |
| 23 | 
                        - ldap? ( =net-nds/openldap-2* )  | 
                    |
| 24 | 
                        - >=net-im/jabber-base-0.0"  | 
                    |
| 25 | 
                        -  | 
                    |
| 26 | 
                        -  | 
                    |
| 27 | 
                        -pkg_setup() {
                       | 
                    |
| 28 | 
                        -  | 
                    |
| 29 | 
                        - if use ipv6 ; then  | 
                    |
| 30 | 
                        - ewarn "You are about to build with ipv6 support, if your system is not using ipv6"  | 
                    |
| 31 | 
                        - ewarn "do control-c now and emerge with \"USE=-ipv6\" "  | 
                    |
| 32 | 
                        - epause 5  | 
                    |
| 33 | 
                        - fi  | 
                    |
| 34 | 
                        -}  | 
                    |
| 35 | 
                        -  | 
                    |
| 36 | 
                        -src_unpack() {
                       | 
                    |
| 37 | 
                        -	unpack jabberd-${PV}.tar.gz
                       | 
                    |
| 38 | 
                        -	cd ${S}
                       | 
                    |
| 39 | 
                        - use ldap && unpack xdb_ldap-1.0.tar.gz  | 
                    |
| 40 | 
                        -	epatch ${FILESDIR}/multiple-xml-patch-00
                       | 
                    |
| 41 | 
                        -	epatch ${FILESDIR}/multiple-xml-patch-01
                       | 
                    |
| 42 | 
                        - #Patch for extexpat DoS http://www.jabber.org/pipermail/jadmin/2004-September/018046.html  | 
                    |
| 43 | 
                        -	epatch ${DISTDIR}/jabberd-1.4.3-extexpat.diff
                       | 
                    |
| 44 | 
                        - mv jabber.xml multiple.xml  | 
                    |
| 45 | 
                        -}  | 
                    |
| 46 | 
                        -  | 
                    |
| 47 | 
                        -src_compile() {
                       | 
                    |
| 48 | 
                        - use amd64 && LDFLAGS='-Wl,-z,now' emerge jabberd  | 
                    |
| 49 | 
                        - # These can cause problems with certain configure scripts used...  | 
                    |
| 50 | 
                        - unset LC_ALL LC_CTYPE  | 
                    |
| 51 | 
                        -  | 
                    |
| 52 | 
                        -  | 
                    |
| 53 | 
                        - local myconf  | 
                    |
| 54 | 
                        -	cd ${S}
                       | 
                    |
| 55 | 
                        - use ssl && myconf="--enable-ssl"  | 
                    |
| 56 | 
                        -	use ipv6 && myconf="${myconf} --enable-ipv6"
                       | 
                    |
| 57 | 
                        -  | 
                    |
| 58 | 
                        - dosed 's:pstrdup(jabberd__runtime,HOME):"/var/spool/jabber":' jabberd/jabberd.c  | 
                    |
| 59 | 
                        -	econf ${myconf} || die
                       | 
                    |
| 60 | 
                        - emake || die  | 
                    |
| 61 | 
                        -  | 
                    |
| 62 | 
                        - if use ldap; then  | 
                    |
| 63 | 
                        -		cd ${S}/xdb_ldap/src
                       | 
                    |
| 64 | 
                        - make all || die  | 
                    |
| 65 | 
                        - fi  | 
                    |
| 66 | 
                        -}  | 
                    |
| 67 | 
                        -  | 
                    |
| 68 | 
                        -src_install() {
                       | 
                    |
| 69 | 
                        -	insinto /etc/conf.d ; newins ${FILESDIR}/jabber-conf.d jabber
                       | 
                    |
| 70 | 
                        -	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r8 jabber
                       | 
                    |
| 71 | 
                        - dodir /usr/sbin /etc/jabber /usr/$(get_libdir)/jabberd /var/log/jabber /usr/include/jabberd  | 
                    |
| 72 | 
                        -	touch ${D}/var/log/jabber/error.log
                       | 
                    |
| 73 | 
                        -	touch ${D}/var/log/jabber/record.log
                       | 
                    |
| 74 | 
                        - dodir /var/spool/jabber  | 
                    |
| 75 | 
                        - dodir /var/run  | 
                    |
| 76 | 
                        -  | 
                    |
| 77 | 
                        - exeinto /usr/sbin  | 
                    |
| 78 | 
                        - doexe jabberd/jabberd  | 
                    |
| 79 | 
                        - insinto /usr/$(get_libdir)/jabberd  | 
                    |
| 80 | 
                        - doins platform-settings  | 
                    |
| 81 | 
                        - doins jsm/jsm.so  | 
                    |
| 82 | 
                        - doins xdb_file/xdb_file.so  | 
                    |
| 83 | 
                        - doins pthsock/pthsock_client.so  | 
                    |
| 84 | 
                        - doins dnsrv/dnsrv.so  | 
                    |
| 85 | 
                        - doins dialback/dialback.so  | 
                    |
| 86 | 
                        - if use ldap; then  | 
                    |
| 87 | 
                        - insinto /etc/jabber  | 
                    |
| 88 | 
                        - doins xdb_ldap/jabber.schema  | 
                    |
| 89 | 
                        - doins xdb_ldap/slapd.conf  | 
                    |
| 90 | 
                        - doins config/xdb-ldap.xml  | 
                    |
| 91 | 
                        - insinto /usr/$(get_libdir)/jabberd  | 
                    |
| 92 | 
                        - doins xdb_ldap/src/xdb_ldap.so  | 
                    |
| 93 | 
                        - fi  | 
                    |
| 94 | 
                        - insinto /etc/jabber  | 
                    |
| 95 | 
                        - doins multiple.xml  | 
                    |
| 96 | 
                        - exeinto /etc/jabber  | 
                    |
| 97 | 
                        -	doexe ${FILESDIR}/self-cert.sh
                       | 
                    |
| 98 | 
                        -  | 
                    |
| 99 | 
                        - local test_group=`grep ^jabber: /etc/group | cut -d: -f1`  | 
                    |
| 100 | 
                        - if [ -z $test_group ]  | 
                    |
| 101 | 
                        - then  | 
                    |
| 102 | 
                        - enewgroup jabber  | 
                    |
| 103 | 
                        - fi  | 
                    |
| 104 | 
                        -  | 
                    |
| 105 | 
                        - local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`  | 
                    |
| 106 | 
                        - if [ -z $test_user ]  | 
                    |
| 107 | 
                        - then  | 
                    |
| 108 | 
                        - enewuser jabber -1 -1 /var/spool/jabber jabber  | 
                    |
| 109 | 
                        - fi  | 
                    |
| 110 | 
                        -  | 
                    |
| 111 | 
                        -	dodoc README UPGRADE ${FILESDIR}/README.Gentoo
                       | 
                    |
| 112 | 
                        -  | 
                    |
| 113 | 
                        - fowners jabber:jabber /etc/jabber  | 
                    |
| 114 | 
                        - fowners jabber:jabber /usr/sbin/jabberd  | 
                    |
| 115 | 
                        - fowners jabber:jabber /var/log/jabber  | 
                    |
| 116 | 
                        - fowners jabber:jabber /var/log/jabber/error.log  | 
                    |
| 117 | 
                        - fowners jabber:jabber /var/log/jabber/record.log  | 
                    |
| 118 | 
                        - fowners jabber:jabber /var/spool/jabber  | 
                    |
| 119 | 
                        -  | 
                    |
| 120 | 
                        - fperms o-rwx /etc/jabber  | 
                    |
| 121 | 
                        - fperms o-rwx /usr/sbin/jabberd  | 
                    |
| 122 | 
                        - fperms o-rwx /var/log/jabber  | 
                    |
| 123 | 
                        - fperms o-rwx /var/log/jabber/error.log  | 
                    |
| 124 | 
                        - fperms o-rwx /var/log/jabber/record.log  | 
                    |
| 125 | 
                        - fperms o-rwx /var/spool/jabber  | 
                    |
| 126 | 
                        - fperms u+rwx /usr/sbin/jabberd  | 
                    |
| 127 | 
                        -  | 
                    |
| 128 | 
                        - fperms g-x /etc/jabber  | 
                    |
| 129 | 
                        - fperms g-x /usr/sbin/jabberd  | 
                    |
| 130 | 
                        - fperms g-x /var/log/jabber  | 
                    |
| 131 | 
                        - fperms g-x /var/log/jabber/error.log  | 
                    |
| 132 | 
                        - fperms g-x /var/log/jabber/record.log  | 
                    |
| 133 | 
                        - fperms g-x /var/spool/jabber  | 
                    |
| 134 | 
                        -  | 
                    |
| 135 | 
                        - fperms g+rw /etc/jabber  | 
                    |
| 136 | 
                        - fperms g+rw /usr/sbin/jabberd  | 
                    |
| 137 | 
                        - fperms g+rw /var/log/jabber  | 
                    |
| 138 | 
                        - fperms g+rw /var/log/jabber/error.log  | 
                    |
| 139 | 
                        - fperms g+rw /var/log/jabber/record.log  | 
                    |
| 140 | 
                        - fperms g+rw /var/spool/jabber  | 
                    |
| 141 | 
                        - fperms u+xs /usr/sbin/jabberd  | 
                    |
| 142 | 
                        -  | 
                    |
| 143 | 
                        - #Install header files for transports to use  | 
                    |
| 144 | 
                        -	cd ${S}/jabberd
                       | 
                    |
| 145 | 
                        -	tar cf - `find . -name \*.h` | (cd ${D}/usr/include/jabberd ; tar xvf -)
                       | 
                    |
| 146 | 
                        - assert "Failed to install header files to /usr/include/jabberd"  | 
                    |
| 147 | 
                        -}  | 
                    |
| 148 | 
                        -  | 
                    |
| 149 | 
                        -pkg_postinst() {
                       | 
                    |
| 150 | 
                        -  | 
                    |
| 151 | 
                        - einfo  | 
                    |
| 152 | 
                        - einfo "Change 'localhost' to your server's domainname in the"  | 
                    |
| 153 | 
                        - einfo "/etc/jabber/*.xml configs first"  | 
                    |
| 154 | 
                        - einfo "Server admins should be added to the "jabber" group"  | 
                    |
| 155 | 
                        - if use ssl; then  | 
                    |
| 156 | 
                        - einfo  | 
                    |
| 157 | 
                        - einfo "To enable SSL connections, execute /etc/jabber/self-cert.sh"  | 
                    |
| 158 | 
                        - fi  | 
                    |
| 159 | 
                        - if use ldap; then  | 
                    |
| 160 | 
                        - einfo  | 
                    |
| 161 | 
                        - einfo "In order to use the ldap backend, you need to copy"  | 
                    |
| 162 | 
                        - einfo "the file /etc/jabber/jabber.schema into the /etc/openldap/schemas"  | 
                    |
| 163 | 
                        - einfo "directory on your ldap server. You will also need to"  | 
                    |
| 164 | 
                        - einfo "include the schema in your slapd.conf file and retsart openldap."  | 
                    |
| 165 | 
                        - einfo "An example slapd.conf file is included in /etc/jabber."  | 
                    |
| 166 | 
                        - einfo "The xdb_ldap backend expects your ldap server to handle"  | 
                    |
| 167 | 
                        - einfo "StartTLS or run in ldaps mode."  | 
                    |
| 168 | 
                        - fi  | 
                    |
| 169 | 
                        - einfo  | 
                    |
| 170 | 
                        - einfo "The various IM transports for jabber are now separate packages,"  | 
                    |
| 171 | 
                        - einfo "which you will need to install separately if you want them:"  | 
                    |
| 172 | 
                        - einfo "net-im/jit - ICQ transport (You can use aim-transport for icq but JIT is better)"  | 
                    |
| 173 | 
                        - einfo "net-im/msn-transport - MSN transport (USE=msn)"  | 
                    |
| 174 | 
                        - einfo "net-im/jud - Jabber User Directory"  | 
                    |
| 175 | 
                        - einfo "net-im/yahoo-transport - Yahoo IM system (USE=yahoo)"  | 
                    |
| 176 | 
                        - einfo "net-im/aim-transport - AOL transport (USE=oscar)"  | 
                    |
| 177 | 
                        - einfo "net-im/mu-conference - Jabber multi user conference"  | 
                    |
| 178 | 
                        - einfo  | 
                    |
| 179 | 
                        -	einfo "Please read /usr/share/doc/${PF}/README.Gentoo.gz"
                       | 
                    |
| 180 | 
                        - einfo  | 
                    |
| 181 | 
                        - ewarn "If upgrading from older version please stop jabberd BEFORE updating the init.d"  | 
                    |
| 182 | 
                        - ewarn "script, or you will end with a \"dead\" server."  | 
                    |
| 183 | 
                        -}  | 
                    |
| 184 | 0 |