April 2008 - 389-commits - Fedora mailing-lists

[Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.21, 1.1.2.22 redhat-patch.inf, 1.1.2.22, 1.1.2.23
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11970 Modified Files: Tag: Directory71RtmBranch fedora-patch.inf redhat-patch.inf Log Message: Put ".so" mistakenly; it should be ".*" to support ".sl" Index: fedora-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/fedora-patch.inf,v retrieving revision 1.1.2.21 retrieving revision 1.1.2.22 diff -u -r1.1.2.21 -r1.1.2.22 --- fedora-patch.inf 30 Apr 2008 20:57:43 -0000 1.1.2.21 +++ fedora-patch.inf 30 Apr 2008 23:01:37 -0000 1.1.2.22 @@ -76,8 +76,8 @@ file: 156120,159037,170321,170328,170556,170558,170816,185765: winsync/PassSync.msi file: 167761: java/jars/ds71.jar file: 169388,169954,170071,170350,181827,179135,179137,238630,429793: lib/replication-plugin.* -file: xxxxxx: bin/slapd/lib/libns-dshttpd71.so -file: xxxxxx: clients/lib/libns-dshttpd71.so +file: xxxxxx: bin/slapd/lib/libns-dshttpd71.* +file: xxxxxx: clients/lib/libns-dshttpd71.* file: xxxxxx: clients/dsgw/bin/auth file: xxxxxx: clients/dsgw/bin/doauth file: xxxxxx: clients/dsgw/bin/edit Index: redhat-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/redhat-patch.inf,v retrieving revision 1.1.2.22 retrieving revision 1.1.2.23 diff -u -r1.1.2.22 -r1.1.2.23 --- redhat-patch.inf 30 Apr 2008 20:57:43 -0000 1.1.2.22 +++ redhat-patch.inf 30 Apr 2008 23:01:37 -0000 1.1.2.23 @@ -76,8 +76,8 @@ file: 156120,159037,170321,170328,170556,170558,170816,185765: winsync/PassSync.msi file: 167761: java/jars/ds71.jar file: 169388,169954,170071,170350,181827,179135,179137,238630,429793: lib/replication-plugin.* -file: xxxxxx: bin/slapd/lib/libns-dshttpd71.so -file: xxxxxx: clients/lib/libns-dshttpd71.so +file: xxxxxx: bin/slapd/lib/libns-dshttpd71.* +file: xxxxxx: clients/lib/libns-dshttpd71.* file: xxxxxx: clients/dsgw/bin/auth file: xxxxxx: clients/dsgw/bin/doauth file: xxxxxx: clients/dsgw/bin/edit

1 0

[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.10.2.13, 1.10.2.14
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv514 Modified Files: Tag: Directory71RtmBranch ldapserver.spec.tmpl Log Message: - initial commit for sp6 Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/Attic/ldapserver.spec.tmpl,v retrieving revision 1.10.2.13 retrieving revision 1.10.2.14 diff -u -r1.10.2.13 -r1.10.2.14 --- ldapserver.spec.tmpl 30 Apr 2008 18:28:23 -0000 1.10.2.13 +++ ldapserver.spec.tmpl 30 Apr 2008 21:20:12 -0000 1.10.2.14 @@ -45,7 +45,7 @@ Summary: @COMPANY-PRODUCT-NAME@ Name: @LCASE-COMPANY-NAME-NOSP@-ds Version: @GEN-VERSION@ -Release: 8.@PLATFORM@ +Release: 9.@PLATFORM@ License: GPL plus extensions Group: System Environment/Daemons URL: @COMPANY-URL@ @@ -136,6 +136,9 @@ fi %changelog +* Wed Apr 30 2008 Noriko Hosoi <nhosoi(a)redhat.com> 7.1-6-9 +- initial commit for sp6 + * Fri Mar 14 2008 Rich Megginson <rmeggins(a)redhat.com> 7.1-4-8 - initial commit for sp5

1 0

[Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.20, 1.1.2.21 redhat-patch.inf, 1.1.2.21, 1.1.2.22
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24889/ldap/cm Modified Files: Tag: Directory71RtmBranch fedora-patch.inf redhat-patch.inf Log Message: Resolves: #182621 Summary: Allow larger regex buffer to enable long substring filters Description: Applying the patches provided by ulf.weltman(a)hp.com. regex.c: use dynamically allocated regex buffer, use ptrdiff_t to store the offsets to be restored after the realloc, and use a constant for the value of "how much the NFA buffer can grow in one iteration on the pattern". string.c: use dynamically allocated buffer if the prepared buffer is not large enough, used wrong pointer (pat instead of p) in a debug message, and performed an unneeded strcat of ".*" Index: fedora-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/fedora-patch.inf,v retrieving revision 1.1.2.20 retrieving revision 1.1.2.21 diff -u -r1.1.2.20 -r1.1.2.21 --- fedora-patch.inf 30 Apr 2008 18:28:30 -0000 1.1.2.20 +++ fedora-patch.inf 30 Apr 2008 20:57:43 -0000 1.1.2.21 @@ -55,7 +55,7 @@ file: 437301: bin/slapd/admin/bin/ns-update file: 147585: plugins/slapd/slapi/examples/testpreop.c file: 164834,165641,166229,173687,175063,202890,247725,297221,196523,208058,311851,240583: bin/slapd/server/ns-slapd -file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221,240897,428764: bin/slapd/server/libslapd.* +file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221,240897,428764,182621: bin/slapd/server/libslapd.* file: 204808: bin/slapd/server/migratecred file: 204808: bin/slapd/server/mmldif file: 204808: bin/slapd/server/pwdhash @@ -67,7 +67,7 @@ file: 160003: bin/slapd/admin/bin/upgradeServer file: 164836,165600,288321: lib/attr-unique-plugin.* file: 165640: lib/views-plugin.* -file: 339791: lib/syntax-plugin.* +file: 339791,182621: lib/syntax-plugin.* file: 297221,288321: lib/acl-plugin.* file: 297221: lib/statechange-plugin.* file: 204808: lib/chainingdb-plugin.* @@ -76,6 +76,20 @@ file: 156120,159037,170321,170328,170556,170558,170816,185765: winsync/PassSync.msi file: 167761: java/jars/ds71.jar file: 169388,169954,170071,170350,181827,179135,179137,238630,429793: lib/replication-plugin.* +file: xxxxxx: bin/slapd/lib/libns-dshttpd71.so +file: xxxxxx: clients/lib/libns-dshttpd71.so +file: xxxxxx: clients/dsgw/bin/auth +file: xxxxxx: clients/dsgw/bin/doauth +file: xxxxxx: clients/dsgw/bin/edit +file: xxxxxx: clients/dsgw/bin/domodify +file: xxxxxx: clients/dsgw/bin/dnedit +file: xxxxxx: clients/dsgw/bin/dosearch +file: xxxxxx: clients/dsgw/bin/unauth +file: xxxxxx: clients/dsgw/bin/search +file: xxxxxx: clients/dsgw/bin/csearch +file: xxxxxx: clients/dsgw/bin/newentry +file: xxxxxx: clients/dsgw/bin/tutor +file: xxxxxx: clients/dsgw/bin/lang file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt file: M324525,M324529: shared/lib/libldap50.* Index: redhat-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/redhat-patch.inf,v retrieving revision 1.1.2.21 retrieving revision 1.1.2.22 diff -u -r1.1.2.21 -r1.1.2.22 --- redhat-patch.inf 30 Apr 2008 18:28:30 -0000 1.1.2.21 +++ redhat-patch.inf 30 Apr 2008 20:57:43 -0000 1.1.2.22 @@ -55,7 +55,7 @@ file: 437301: bin/slapd/admin/bin/ns-update file: 147585: plugins/slapd/slapi/examples/testpreop.c file: 164834,165641,166229,173687,175063,202890,247725,297221,196523,208058,311851,240583: bin/slapd/server/ns-slapd -file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221,240897,428764: bin/slapd/server/libslapd.* +file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221,240897,428764,182621: bin/slapd/server/libslapd.* file: 204808: bin/slapd/server/migratecred file: 204808: bin/slapd/server/mmldif file: 204808: bin/slapd/server/pwdhash @@ -67,7 +67,7 @@ file: 160003: bin/slapd/admin/bin/upgradeServer file: 164836,165600,288321: lib/attr-unique-plugin.* file: 165640: lib/views-plugin.* -file: 339791: lib/syntax-plugin.* +file: 339791,182621: lib/syntax-plugin.* file: 297221,288321: lib/acl-plugin.* file: 297221: lib/statechange-plugin.* file: 204808: lib/chainingdb-plugin.* @@ -76,6 +76,20 @@ file: 156120,159037,170321,170328,170556,170558,170816,185765: winsync/PassSync.msi file: 167761: java/jars/ds71.jar file: 169388,169954,170071,170350,181827,179135,179137,238630,429793: lib/replication-plugin.* +file: xxxxxx: bin/slapd/lib/libns-dshttpd71.so +file: xxxxxx: clients/lib/libns-dshttpd71.so +file: xxxxxx: clients/dsgw/bin/auth +file: xxxxxx: clients/dsgw/bin/doauth +file: xxxxxx: clients/dsgw/bin/edit +file: xxxxxx: clients/dsgw/bin/domodify +file: xxxxxx: clients/dsgw/bin/dnedit +file: xxxxxx: clients/dsgw/bin/dosearch +file: xxxxxx: clients/dsgw/bin/unauth +file: xxxxxx: clients/dsgw/bin/search +file: xxxxxx: clients/dsgw/bin/csearch +file: xxxxxx: clients/dsgw/bin/newentry +file: xxxxxx: clients/dsgw/bin/tutor +file: xxxxxx: clients/dsgw/bin/lang file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt file: M324525,M324529: shared/lib/libldap50.*

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/plugins/syntaxes string.c, 1.5, 1.5.2.1
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24889/ldap/servers/plugins/syntaxes Modified Files: Tag: Directory71RtmBranch string.c Log Message: Resolves: #182621 Summary: Allow larger regex buffer to enable long substring filters Description: Applying the patches provided by ulf.weltman(a)hp.com. regex.c: use dynamically allocated regex buffer, use ptrdiff_t to store the offsets to be restored after the realloc, and use a constant for the value of "how much the NFA buffer can grow in one iteration on the pattern". string.c: use dynamically allocated buffer if the prepared buffer is not large enough, used wrong pointer (pat instead of p) in a debug message, and performed an unneeded strcat of ".*" Index: string.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/string.c,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -r1.5 -r1.5.2.1 --- string.c 19 Apr 2005 22:07:35 -0000 1.5 +++ string.c 30 Apr 2008 20:57:44 -0000 1.5.2.1 @@ -183,8 +183,8 @@ string_filter_sub( Slapi_PBlock *pb, char *initial, char **any, char *final, Slapi_Value **bvals, int syntax ) { - int i, j, rc; - char *p, *end, *realval, *tmpbuf; + int i, j, rc, size=0; + char *p, *end, *realval, *tmpbuf, *bigpat = NULL; size_t tmpbufsize; char pat[BUFSIZ]; char buf[BUFSIZ]; @@ -192,7 +192,6 @@ LDAPDebug( LDAP_DEBUG_FILTER, "=> string_filter_sub\n", 0, 0, 0 ); - /* * construct a regular expression corresponding to the * filter and let regex do the work for each value @@ -201,16 +200,33 @@ pat[0] = '\0'; p = pat; end = pat + sizeof(pat) - 2; /* leave room for null */ + if ( initial != NULL ) { - value_normalize( initial, syntax, 1 /* trim leading blanks */ ); - strcpy( p, "^" ); - p = strchr( p, '\0' ); - /* 2 * in case every char is special */ - if ( p + 2 * strlen( initial ) > end ) { - LDAPDebug( LDAP_DEBUG_ANY, "not enough pattern space\n", - 0, 0, 0 ); - return( -1 ); + size = strlen( initial ) + 1; /* add 1 for "^" */ + } + + if ( any != NULL ) { + i = 0; + while ( any[i] ) { + size += strlen(any[i++]) + 2; /* add 2 for ".*" */ } + } + + if ( final != NULL ) { + size += strlen( final ) + 3; /* add 3 for ".*" and "$" */ + } + + size *= 2; /* doubled in case all filter chars need escaping */ + size++; /* add 1 for null */ + + if ( p + size > end ) { + bigpat = slapi_ch_malloc( size ); + p = bigpat; + } + + if ( initial != NULL ) { + value_normalize( initial, syntax, 1 /* trim leading blanks */ ); + *p++ = '^'; filter_strcpy_special( p, initial ); p = strchr( p, '\0' ); } @@ -218,13 +234,8 @@ for ( i = 0; any[i] != NULL; i++ ) { value_normalize( any[i], syntax, 0 /* DO NOT trim leading blanks */ ); /* ".*" + value */ - if ( p + 2 * strlen( any[i] ) + 2 > end ) { - LDAPDebug( LDAP_DEBUG_ANY, - "not enough pattern space\n", 0, 0, 0 ); - return( -1 ); - } - strcpy( p, ".*" ); - p = strchr( p, '\0' ); + *p++ = '.'; + *p++ = '*'; filter_strcpy_special( p, any[i] ); p = strchr( p, '\0' ); } @@ -232,28 +243,26 @@ if ( final != NULL ) { value_normalize( final, syntax, 0 /* DO NOT trim leading blanks */ ); /* ".*" + value */ - if ( p + 2 * strlen( final ) + 2 > end ) { - LDAPDebug( LDAP_DEBUG_ANY, "not enough pattern space\n", - 0, 0, 0 ); - return( -1 ); - } - strcpy( p, ".*" ); - p = strchr( p, '\0' ); + *p++ = '.'; + *p++ = '*'; filter_strcpy_special( p, final ); - p = strchr( p, '\0' ); - strcpy( p, "$" ); + strcat( p, "$" ); } /* compile the regex */ + p = (bigpat) ? bigpat : pat; slapd_re_lock(); - if ( (p = slapd_re_comp( pat )) != 0 ) { + if ( (tmpbuf = slapd_re_comp( p )) != 0 ) { LDAPDebug( LDAP_DEBUG_ANY, "re_comp (%s) failed (%s)\n", pat, p, 0 ); slapd_re_unlock(); - return( -1 ); + if( bigpat != NULL ) { + slapi_ch_free((void**)&bigpat ); + } + return( LDAP_OPERATIONS_ERROR ); } else { LDAPDebug( LDAP_DEBUG_TRACE, "re_comp (%s)\n", - escape_string( pat, ebuf ), 0, 0 ); + escape_string( p, ebuf ), 0, 0 ); } /* @@ -265,7 +274,7 @@ for ( j = 0; bvals[j] != NULL; j++ ) { int tmprc; size_t len; - const struct berval *bvp = slapi_value_get_berval(bvals[j]); + const struct berval *bvp = slapi_value_get_berval(bvals[j]); len = bvp->bv_len; if ( len < sizeof(buf) ) { @@ -294,6 +303,9 @@ if ( tmpbuf != NULL ) { slapi_ch_free((void**)&tmpbuf ); } + if( bigpat != NULL ) { + slapi_ch_free((void**)&bigpat ); + } LDAPDebug( LDAP_DEBUG_FILTER, "<= string_filter_sub %d\n", rc, 0, 0 );

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd regex.c, 1.4, 1.4.2.1
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24889/ldap/servers/slapd Modified Files: Tag: Directory71RtmBranch regex.c Log Message: Resolves: #182621 Summary: Allow larger regex buffer to enable long substring filters Description: Applying the patches provided by ulf.weltman(a)hp.com. regex.c: use dynamically allocated regex buffer, use ptrdiff_t to store the offsets to be restored after the realloc, and use a constant for the value of "how much the NFA buffer can grow in one iteration on the pattern". string.c: use dynamically allocated buffer if the prepared buffer is not large enough, used wrong pointer (pat instead of p) in a debug message, and performed an unneeded strcat of ".*" Index: regex.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/regex.c,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- regex.c 19 Apr 2005 22:07:37 -0000 1.4 +++ regex.c 30 Apr 2008 20:57:44 -0000 1.4.2.1 @@ -38,31 +38,6 @@ #include "slap.h" /* must come before regex.h */ #include "portable.h" -static PRLock *regex_mutex = NULL; - -int -slapd_re_init( void ) -{ - if ( NULL == regex_mutex ) { - regex_mutex = PR_NewLock(); - } - return( NULL == regex_mutex ? -1 : 0 ); -} - -void -slapd_re_lock( void ) -{ - PR_ASSERT( NULL != regex_mutex ); - PR_Lock( regex_mutex ); -} - -int -slapd_re_unlock( void ) -{ - PR_ASSERT( NULL != regex_mutex ); - return( PR_Unlock( regex_mutex ) ); -} - #if defined( MACOS ) || defined( DOS ) || defined( _WIN32 ) || defined( NEED_BSDREGEX ) #include "regex.h" @@ -86,6 +61,13 @@ * Modification history: * * $Log$ + * Revision 1.4.2.1 2008/04/30 20:57:44 nhosoi + * Resolves: #182621 + * Summary: Allow larger regex buffer to enable long substring filters + * Description: Applying the patches provided by ulf.weltman(a)hp.com. + * regex.c: use dynamically allocated regex buffer, use ptrdiff_t to store the offsets to be restored after the realloc, and use a constant for the value of "how much the NFA buffer can grow in one iteration on the pattern". + * string.c: use dynamically allocated buffer if the prepared buffer is not large enough, used wrong pointer (pat instead of p) in a debug message, and performed an unneeded strcat of ".*" + * * Revision 1.4 2005/04/19 22:07:37 nkinder * Fixed licensing typo * @@ -401,6 +383,12 @@ * matches: foo-foo fo-fo fob-fob foobar-foobar ... */ +/* This is the maximum the NFA buffer might grow for every op code processed. + The max seems to be the + after a character class, like "[a-z]+". It + needs 1 byte for the CCL code, 16 for the CCL bit map, and 2 for END codes + and 1 for a CLO code. */ +#define MAXOPSPACE 20 + #define MAXNFA 1024 #define MAXTAG 10 @@ -439,7 +427,8 @@ */ static int tagstk[MAXTAG]; /* subpat tag stack..*/ -static UCHAR nfa[MAXNFA]; /* automaton.. */ +static UCHAR *nfa = NULL; /* automaton.. */ +static int nfasize = MAXNFA; /* tracks size of nfa buffer */ static int sta = NOP; /* status of lastpat */ static UCHAR bittab[BITBLK]; /* bit table for CCL */ @@ -483,6 +472,20 @@ sta = NOP; for (p = (UCHAR*)pat; *p; p++) { + /* Check if we are approaching end of nfa buffer. MAXOPSPACE is+ the max we might add to the nfa per loop. */ + if (mp - (UCHAR*)nfa + MAXOPSPACE >= nfasize) { + /* Save offsets */ + ptrdiff_t mppos = mp - nfa; + ptrdiff_t sppos = sp - nfa; + + /* Double the nfa buffer size */ + nfasize *= 2; + nfa = (UCHAR*)slapi_ch_realloc((char*)nfa, nfasize); + + /* Restore pointers into realloced space */ + mp = nfa + mppos; + sp = nfa + sppos; + } lp = mp; switch(*p) { @@ -1084,3 +1087,35 @@ } #endif #endif /* MACOS or DOS or NEED_BSDREGEX */ + +static PRLock *regex_mutex = NULL; + +int +slapd_re_init( void ) +{ + if ( NULL == regex_mutex ) { + regex_mutex = PR_NewLock(); + } + +#if defined( MACOS ) || defined( DOS ) || defined( _WIN32 ) || defined( NEED_BSDREGEX ) + if ( NULL == nfa ) { + nfa = (UCHAR*)slapi_ch_malloc( MAXNFA ); + } +#endif + + return( NULL == regex_mutex ? -1 : 0 ); +} + +void +slapd_re_lock( void ) +{ + PR_ASSERT( NULL != regex_mutex ); + PR_Lock( regex_mutex ); +} + +int +slapd_re_unlock( void ) +{ + PR_ASSERT( NULL != regex_mutex ); + return( PR_Unlock( regex_mutex ) ); +}

1 0

[Fedora-directory-commits] dsmlgw/src/com/netscape/xmltools DSML2LDIF.java, 1.2, 1.3 DSMLReader.java, 1.2, 1.3 DSMLSAXBuilder.java, 1.2, 1.3 DSMLSAXHandler.java, 1.2, 1.3 DSMLWriter.java, 1.2, 1.3 GetOpt.java, 1.2, 1.3 LDIF2DSML.java, 1.2, 1.3
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/src/com/netscape/xmltools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24176/dsmlgw/src/com/netscape/xmltools Modified Files: DSML2LDIF.java DSMLReader.java DSMLSAXBuilder.java DSMLSAXHandler.java DSMLWriter.java GetOpt.java LDIF2DSML.java Log Message: relicense all files under the GPLv2 + gnu classpathx exception - remove etc/dirsrv/dsmlgw/dsmlgw.cfg - the ant tar task has to explicitly set the executable mode of scripts Index: DSML2LDIF.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/DSML2LDIF.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DSML2LDIF.java 18 Apr 2008 16:43:39 -0000 1.2 +++ DSML2LDIF.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /** BEGIN COPYRIGHT BLOCK - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. Index: DSMLReader.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/DSMLReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DSMLReader.java 18 Apr 2008 16:43:39 -0000 1.2 +++ DSMLReader.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /** BEGIN COPYRIGHT BLOCK - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. Index: DSMLSAXBuilder.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/DSMLSAXBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DSMLSAXBuilder.java 18 Apr 2008 16:43:39 -0000 1.2 +++ DSMLSAXBuilder.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /** BEGIN COPYRIGHT BLOCK - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. Index: DSMLSAXHandler.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/DSMLSAXHandler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DSMLSAXHandler.java 18 Apr 2008 16:43:39 -0000 1.2 +++ DSMLSAXHandler.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /** BEGIN COPYRIGHT BLOCK - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. Index: DSMLWriter.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/DSMLWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DSMLWriter.java 18 Apr 2008 16:43:39 -0000 1.2 +++ DSMLWriter.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /** BEGIN COPYRIGHT BLOCK - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. Index: GetOpt.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/GetOpt.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- GetOpt.java 18 Apr 2008 16:43:39 -0000 1.2 +++ GetOpt.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /** BEGIN COPYRIGHT BLOCK - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. Index: LDIF2DSML.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/LDIF2DSML.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- LDIF2DSML.java 18 Apr 2008 16:43:39 -0000 1.2 +++ LDIF2DSML.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /** BEGIN COPYRIGHT BLOCK - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.

1 0

[Fedora-directory-commits] dsmlgw/scripts dsml2ldif.in, 1.1, 1.2 dsmlgw-search.in, 1.2, 1.3 ldif2dsml.in, 1.1, 1.2 restart-ds-dsmlgw.in, 1.1, 1.2 setup-ds-dsmlgw.in, 1.1, 1.2 start-ds-dsmlgw.in, 1.1, 1.2 stop-ds-dsmlgw.in, 1.1, 1.2
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24176/dsmlgw/scripts Modified Files: dsml2ldif.in dsmlgw-search.in ldif2dsml.in restart-ds-dsmlgw.in setup-ds-dsmlgw.in start-ds-dsmlgw.in stop-ds-dsmlgw.in Log Message: relicense all files under the GPLv2 + gnu classpathx exception - remove etc/dirsrv/dsmlgw/dsmlgw.cfg - the ant tar task has to explicitly set the executable mode of scripts Index: dsml2ldif.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/dsml2ldif.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dsml2ldif.in 25 Apr 2008 02:28:09 -0000 1.1 +++ dsml2ldif.in 30 Apr 2008 20:49:22 -0000 1.2 @@ -1,17 +1,24 @@ #!/bin/sh # # BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# As a special exception, if you link this library with other files to +# produce an executable, this library does not by itself cause the +# resulting executable to be covered by the GNU General Public License. +# This exception does not however invalidate any other reasons why the +# executable file might be covered by the GNU General Public License. # # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. Index: dsmlgw-search.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/dsmlgw-search.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dsmlgw-search.in 24 Apr 2008 21:52:41 -0000 1.2 +++ dsmlgw-search.in 30 Apr 2008 20:49:22 -0000 1.3 @@ -1,19 +1,26 @@ #!/bin/sh # # BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# As a special exception, if you link this library with other files to +# produce an executable, this library does not by itself cause the +# resulting executable to be covered by the GNU General Public License. +# This exception does not however invalidate any other reasons why the +# executable file might be covered by the GNU General Public License. # -# Copyright (C) 2006 Red Hat, Inc. +# Copyright (C) 2008 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # Index: ldif2dsml.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/ldif2dsml.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ldif2dsml.in 25 Apr 2008 02:28:09 -0000 1.1 +++ ldif2dsml.in 30 Apr 2008 20:49:22 -0000 1.2 @@ -1,17 +1,24 @@ #!/bin/sh # # BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# As a special exception, if you link this library with other files to +# produce an executable, this library does not by itself cause the +# resulting executable to be covered by the GNU General Public License. +# This exception does not however invalidate any other reasons why the +# executable file might be covered by the GNU General Public License. # # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. Index: restart-ds-dsmlgw.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/restart-ds-dsmlgw.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- restart-ds-dsmlgw.in 24 Apr 2008 21:39:10 -0000 1.1 +++ restart-ds-dsmlgw.in 30 Apr 2008 20:49:22 -0000 1.2 @@ -1,19 +1,26 @@ #!/bin/sh # # BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# As a special exception, if you link this library with other files to +# produce an executable, this library does not by itself cause the +# resulting executable to be covered by the GNU General Public License. +# This exception does not however invalidate any other reasons why the +# executable file might be covered by the GNU General Public License. # -# Copyright (C) 2006 Red Hat, Inc. +# Copyright (C) 2008 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # Index: setup-ds-dsmlgw.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/setup-ds-dsmlgw.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- setup-ds-dsmlgw.in 24 Apr 2008 21:39:10 -0000 1.1 +++ setup-ds-dsmlgw.in 30 Apr 2008 20:49:22 -0000 1.2 @@ -1,19 +1,26 @@ #!/bin/sh # # BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# As a special exception, if you link this library with other files to +# produce an executable, this library does not by itself cause the +# resulting executable to be covered by the GNU General Public License. +# This exception does not however invalidate any other reasons why the +# executable file might be covered by the GNU General Public License. # -# Copyright (C) 2006 Red Hat, Inc. +# Copyright (C) 2008 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # Index: start-ds-dsmlgw.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/start-ds-dsmlgw.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- start-ds-dsmlgw.in 24 Apr 2008 21:39:10 -0000 1.1 +++ start-ds-dsmlgw.in 30 Apr 2008 20:49:22 -0000 1.2 @@ -1,19 +1,26 @@ #!/bin/sh # # BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# As a special exception, if you link this library with other files to +# produce an executable, this library does not by itself cause the +# resulting executable to be covered by the GNU General Public License. +# This exception does not however invalidate any other reasons why the +# executable file might be covered by the GNU General Public License. # -# Copyright (C) 2006 Red Hat, Inc. +# Copyright (C) 2008 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # Index: stop-ds-dsmlgw.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/stop-ds-dsmlgw.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- stop-ds-dsmlgw.in 24 Apr 2008 21:39:10 -0000 1.1 +++ stop-ds-dsmlgw.in 30 Apr 2008 20:49:22 -0000 1.2 @@ -1,19 +1,26 @@ #!/bin/sh # # BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# As a special exception, if you link this library with other files to +# produce an executable, this library does not by itself cause the +# resulting executable to be covered by the GNU General Public License. +# This exception does not however invalidate any other reasons why the +# executable file might be covered by the GNU General Public License. # -# Copyright (C) 2006 Red Hat, Inc. +# Copyright (C) 2008 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK #

1 0

30 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24176/dsmlgw/src/com/netscape/dsml/gateway Modified Files: BatchProcessor.java Configuration.java Constants.java GenericOperation.java IConnMgrFactoryFunctor.java IConnectionManager.java LDAPAuthenticator.java OperationAdd.java OperationAuth.java OperationCompare.java OperationDelete.java OperationExtended.java OperationModify.java OperationModifyDN.java OperationSearch.java ParseControl.java ParseFilter.java ParseValue.java ProxyConnMgrFactory.java ProxyConnectionManager.java gatewayContext.java gatewayException.java gatewayHandler.java gatewayService.java Log Message: relicense all files under the GPLv2 + gnu classpathx exception - remove etc/dirsrv/dsmlgw/dsmlgw.cfg - the ant tar task has to explicitly set the executable mode of scripts Index: BatchProcessor.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BatchProcessor.java 18 Apr 2008 16:43:39 -0000 1.2 +++ BatchProcessor.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: Configuration.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/Configuration.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Configuration.java 25 Apr 2008 21:04:37 -0000 1.3 +++ Configuration.java 30 Apr 2008 20:49:23 -0000 1.4 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: Constants.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/Constants.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Constants.java 18 Apr 2008 16:43:39 -0000 1.2 +++ Constants.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: GenericOperation.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- GenericOperation.java 18 Apr 2008 16:43:39 -0000 1.2 +++ GenericOperation.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: IConnMgrFactoryFunctor.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- IConnMgrFactoryFunctor.java 18 Apr 2008 16:43:39 -0000 1.2 +++ IConnMgrFactoryFunctor.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: IConnectionManager.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- IConnectionManager.java 18 Apr 2008 16:43:39 -0000 1.2 +++ IConnectionManager.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: LDAPAuthenticator.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- LDAPAuthenticator.java 18 Apr 2008 16:43:39 -0000 1.2 +++ LDAPAuthenticator.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: OperationAdd.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- OperationAdd.java 18 Apr 2008 16:43:39 -0000 1.2 +++ OperationAdd.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: OperationAuth.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- OperationAuth.java 18 Apr 2008 16:43:39 -0000 1.2 +++ OperationAuth.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: OperationCompare.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- OperationCompare.java 18 Apr 2008 16:43:39 -0000 1.2 +++ OperationCompare.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: OperationDelete.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- OperationDelete.java 18 Apr 2008 16:43:39 -0000 1.2 +++ OperationDelete.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: OperationExtended.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- OperationExtended.java 18 Apr 2008 16:43:39 -0000 1.2 +++ OperationExtended.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: OperationModify.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationModify.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- OperationModify.java 18 Apr 2008 16:43:39 -0000 1.2 +++ OperationModify.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: OperationModifyDN.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- OperationModifyDN.java 18 Apr 2008 16:43:39 -0000 1.2 +++ OperationModifyDN.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: OperationSearch.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- OperationSearch.java 18 Apr 2008 16:43:39 -0000 1.2 +++ OperationSearch.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: ParseControl.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ParseControl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ParseControl.java 18 Apr 2008 16:43:39 -0000 1.2 +++ ParseControl.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: ParseFilter.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ParseFilter.java 18 Apr 2008 16:43:39 -0000 1.2 +++ ParseFilter.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: ParseValue.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ParseValue.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ParseValue.java 18 Apr 2008 16:43:39 -0000 1.2 +++ ParseValue.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: ProxyConnMgrFactory.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ProxyConnMgrFactory.java 18 Apr 2008 16:43:39 -0000 1.2 +++ ProxyConnMgrFactory.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: ProxyConnectionManager.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ProxyConnectionManager.java 18 Apr 2008 16:43:39 -0000 1.2 +++ ProxyConnectionManager.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: gatewayContext.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gatewayContext.java 18 Apr 2008 16:43:39 -0000 1.2 +++ gatewayContext.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: gatewayException.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/gatewayException.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gatewayException.java 18 Apr 2008 16:43:39 -0000 1.2 +++ gatewayException.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: gatewayHandler.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gatewayHandler.java 24 Apr 2008 21:39:11 -0000 1.3 +++ gatewayHandler.java 30 Apr 2008 20:49:23 -0000 1.4 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: gatewayService.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/gatewayService.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gatewayService.java 18 Apr 2008 16:43:39 -0000 1.2 +++ gatewayService.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc.

1 0

[Fedora-directory-commits] dsmlgw/src/com/netscape/dsml/test SOAPClient.java, 1.2, 1.3 dsmlClient.java, 1.2, 1.3 dsmlSearch.java, 1.2, 1.3
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/src/com/netscape/dsml/test In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24176/dsmlgw/src/com/netscape/dsml/test Modified Files: SOAPClient.java dsmlClient.java dsmlSearch.java Log Message: relicense all files under the GPLv2 + gnu classpathx exception - remove etc/dirsrv/dsmlgw/dsmlgw.cfg - the ant tar task has to explicitly set the executable mode of scripts Index: SOAPClient.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/test/SOAPClient.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SOAPClient.java 18 Apr 2008 16:43:39 -0000 1.2 +++ SOAPClient.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: dsmlClient.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/test/dsmlClient.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dsmlClient.java 18 Apr 2008 16:43:39 -0000 1.2 +++ dsmlClient.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc. Index: dsmlSearch.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/test/dsmlSearch.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dsmlSearch.java 18 Apr 2008 16:43:39 -0000 1.2 +++ dsmlSearch.java 30 Apr 2008 20:49:23 -0000 1.3 @@ -1,15 +1,22 @@ /* --- BEGIN COPYRIGHT BLOCK --- - * This Program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; version 2 of the License. - * - * This Program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA. + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, if you link this library with other files to + * produce an executable, this library does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why the + * executable file might be covered by the GNU General Public License. * * * Copyright (C) 2005 Red Hat, Inc.

1 0

[Fedora-directory-commits] dsmlgw/misc dsmlgw.cfg, 1.2, 1.3 fedora-ds-dsmlgw.spec, 1.1, 1.2
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/misc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24176/dsmlgw/misc Modified Files: dsmlgw.cfg fedora-ds-dsmlgw.spec Log Message: relicense all files under the GPLv2 + gnu classpathx exception - remove etc/dirsrv/dsmlgw/dsmlgw.cfg - the ant tar task has to explicitly set the executable mode of scripts Index: dsmlgw.cfg =================================================================== RCS file: /cvs/dirsec/dsmlgw/misc/dsmlgw.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dsmlgw.cfg 18 Apr 2008 16:43:38 -0000 1.2 +++ dsmlgw.cfg 30 Apr 2008 20:49:22 -0000 1.3 @@ -1,16 +1,22 @@ # BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. -# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# As a special exception, if you link this library with other files to +# produce an executable, this library does not by itself cause the +# resulting executable to be covered by the GNU General Public License. +# This exception does not however invalidate any other reasons why the +# executable file might be covered by the GNU General Public License. # # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. Index: fedora-ds-dsmlgw.spec =================================================================== RCS file: /cvs/dirsec/dsmlgw/misc/fedora-ds-dsmlgw.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-ds-dsmlgw.spec 18 Apr 2008 16:43:38 -0000 1.1 +++ fedora-ds-dsmlgw.spec 30 Apr 2008 20:49:22 -0000 1.2 @@ -10,7 +10,7 @@ Summary: Fedora Directory Server DSML Gateway Group: Applications/System -License: GPLv2 +License: GPLv2 + GNU Classpath exception URL: http://directory.fedoraproject.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

1 0

[Fedora-directory-commits] dsmlgw/dsml European.dsml, 1.2, 1.3 Example-roles.dsml, 1.2, 1.3 Example.dsml, 1.2, 1.3
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/dsml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24176/dsmlgw/dsml Modified Files: European.dsml Example-roles.dsml Example.dsml Log Message: relicense all files under the GPLv2 + gnu classpathx exception - remove etc/dirsrv/dsmlgw/dsmlgw.cfg - the ant tar task has to explicitly set the executable mode of scripts Index: European.dsml =================================================================== RCS file: /cvs/dirsec/dsmlgw/dsml/European.dsml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- European.dsml 18 Apr 2008 16:43:38 -0000 1.2 +++ European.dsml 30 Apr 2008 20:49:22 -0000 1.3 @@ -1,17 +1,23 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- BEGIN COPYRIGHT BLOCK - This Program is free software; you can redistribute it and/or modify it under - the terms of the GNU General Public License as published by the Free Software - Foundation; version 2 of the License. + This Program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This Program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + This Program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License along with - this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - Place, Suite 330, Boston, MA 02111-1307 USA. + You should have received a copy of the GNU General Public License + along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + As a special exception, if you link this library with other files to + produce an executable, this library does not by itself cause the + resulting executable to be covered by the GNU General Public License. + This exception does not however invalidate any other reasons why the + executable file might be covered by the GNU General Public License. Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. Copyright (C) 2005 Red Hat, Inc. Index: Example-roles.dsml =================================================================== RCS file: /cvs/dirsec/dsmlgw/dsml/Example-roles.dsml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Example-roles.dsml 18 Apr 2008 16:43:38 -0000 1.2 +++ Example-roles.dsml 30 Apr 2008 20:49:22 -0000 1.3 @@ -1,17 +1,23 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- BEGIN COPYRIGHT BLOCK - This Program is free software; you can redistribute it and/or modify it under - the terms of the GNU General Public License as published by the Free Software - Foundation; version 2 of the License. + This Program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This Program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + This Program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License along with - this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - Place, Suite 330, Boston, MA 02111-1307 USA. + You should have received a copy of the GNU General Public License + along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + As a special exception, if you link this library with other files to + produce an executable, this library does not by itself cause the + resulting executable to be covered by the GNU General Public License. + This exception does not however invalidate any other reasons why the + executable file might be covered by the GNU General Public License. Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. Copyright (C) 2005 Red Hat, Inc. Index: Example.dsml =================================================================== RCS file: /cvs/dirsec/dsmlgw/dsml/Example.dsml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Example.dsml 18 Apr 2008 16:43:38 -0000 1.2 +++ Example.dsml 30 Apr 2008 20:49:22 -0000 1.3 @@ -1,17 +1,23 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- BEGIN COPYRIGHT BLOCK - This Program is free software; you can redistribute it and/or modify it under - the terms of the GNU General Public License as published by the Free Software - Foundation; version 2 of the License. + This Program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This Program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + This Program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License along with - this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - Place, Suite 330, Boston, MA 02111-1307 USA. + You should have received a copy of the GNU General Public License + along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + As a special exception, if you link this library with other files to + produce an executable, this library does not by itself cause the + resulting executable to be covered by the GNU General Public License. + This exception does not however invalidate any other reasons why the + executable file might be covered by the GNU General Public License. Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. Copyright (C) 2005 Red Hat, Inc.

1 0

[Fedora-directory-commits] dsmlgw LICENSE, 1.1, 1.2 build.xml, 1.9, 1.10
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24176/dsmlgw Modified Files: LICENSE build.xml Log Message: relicense all files under the GPLv2 + gnu classpathx exception - remove etc/dirsrv/dsmlgw/dsmlgw.cfg - the ant tar task has to explicitly set the executable mode of scripts Index: LICENSE =================================================================== RCS file: /cvs/dirsec/dsmlgw/LICENSE,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE 18 Apr 2008 16:43:38 -0000 1.1 +++ LICENSE 30 Apr 2008 20:49:21 -0000 1.2 @@ -1,13 +1,18 @@ -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. +This Program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; version 2 of the License. -This program is distributed in the hope that it will be useful, +This Program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +As a special exception, if you link this library with other files to +produce an executable, this library does not by itself cause the +resulting executable to be covered by the GNU General Public License. +This exception does not however invalidate any other reasons why the +executable file might be covered by the GNU General Public License. Index: build.xml =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- build.xml 25 Apr 2008 02:28:09 -0000 1.9 +++ build.xml 30 Apr 2008 20:49:21 -0000 1.10 @@ -1,16 +1,23 @@ <?xml version='1.0'?> <!-- BEGIN COPYRIGHT BLOCK - This Program is free software; you can redistribute it and/or modify it under - the terms of the GNU General Public License as published by the Free Software - Foundation; version 2 of the License. - - This Program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - this Program; if not, write to the Free Software Foundation, Inc., 59 Temple - Place, Suite 330, Boston, MA 02111-1307 USA. + This Program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This Program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + As a special exception, if you link this library with other files to + produce an executable, this library does not by itself cause the + resulting executable to be covered by the GNU General Public License. + This exception does not however invalidate any other reasons why the + executable file might be covered by the GNU General Public License. Copyright (C) 2005 Red Hat, Inc. All rights reserved. @@ -226,18 +233,22 @@ <copyfilter file="scripts/ldif2dsml.in" tofile="${pkg.dir}${dsmlgwbindir}/ldif2dsml"/> <chmod file="${pkg.dir}${dsmlgwbindir}/ldif2dsml" perm="0755"/> - <copy file="misc/dsmlgw.cfg" todir="${pkg.dir}${dsmlgwconfigdir}"/> - <chmod file="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.cfg" perm="0644"/> <copy todir="${pkg.dir}${dsmlgwdatadir}/data"> <fileset dir="dsml"> <include name="*.dsml"/> </fileset> </copy> - <tar destfile="${dist.dir}/${ant.project.name}-${version}.tar" - basedir="${pkg.dir}"/> - <gzip zipfile="${dist.dir}/${ant.project.name}-${version}.tar.gz" - src="${dist.dir}/${ant.project.name}-${version}.tar"/> - <delete file="${dist.dir}/${ant.project.name}-${version}.tar"/> + <tar destfile="${dist.dir}/${ant.project.name}-${version}.tar.gz" + compression="gzip"> + <tarfileset dir="${pkg.dir}" mode="0755"> + <include name="**/bin/**"/> + <include name="**/sbin/**"/> + </tarfileset> + <tarfileset dir="${pkg.dir}"> + <exclude name="**/bin/**"/> + <exclude name="**/sbin/**"/> + </tarfileset> + </tar> </target> <target name="prepare" description="prepares the output directories">

1 0

[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts template-repl-monitor-cgi.pl, 1.4, 1.4.2.1
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4673/ldap/admin/src/scripts Modified Files: Tag: Directory71RtmBranch template-repl-monitor-cgi.pl Log Message: Resolves: RHSA-2008:0199 Description: A shell command injection flaw in the Red Hat Administration Server replication monitor CGI script could be exploited by an attacker to execute arbitrary shell commands with root privileges. Index: template-repl-monitor-cgi.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Attic/template-repl-monitor-cgi.pl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- template-repl-monitor-cgi.pl 19 Apr 2005 22:07:00 -0000 1.4 +++ template-repl-monitor-cgi.pl 30 Apr 2008 18:28:25 -0000 1.4.2.1 @@ -40,33 +40,40 @@ use Cgi; -$params = ""; -$params .= " -h $cgiVars{'servhost'}" if $cgiVars{'servhost'}; -$params .= " -p $cgiVars{'servport'}" if $cgiVars{'servport'}; -$params .= " -f $cgiVars{'configfile'}" if $cgiVars{'configfile'}; -$params .= " -t $cgiVars{'refreshinterval'}" if $cgiVars{'refreshinterval'}; -if ($cgiVars{'admurl'}) { - $admurl = "$cgiVars{'admurl'}"; - if ( $ENV{'QUERY_STRING'} ) { - $admurl .= "?$ENV{'QUERY_STRING'}"; - } - elsif ( $ENV{'CONTENT_LENGTH'} ) { - $admurl .= "?$Cgi::CONTENT"; - } - $params .= " -u \"$admurl\""; -} -$siteroot = $cgiVars{'siteroot'}; +@ARGV = (); # clear it out +my $configfile = $ENV{ADMSERV_ROOT} . "/replmon.conf"; +push @ARGV, '-f', $configfile; + +my $refreshinterval = $cgiVars{'refreshinterval'} ? int($cgiVars{'refreshinterval'}) : "300"; +push @ARGV, '-t', $refreshinterval; + +my $siteroot = $ENV{NETSITE_ROOT}; $perl = "$siteroot/bin/slapd/admin/bin/perl"; $ENV{'LD_LIBRARY_PATH'} = "$siteroot/lib:$siteroot/lib/nsPerl5.005_03/lib"; -# Save user-specified parameters as cookies in monreplication.properties. -# Sync up with the property file so that monreplication2 is interval, and -# monreplication3 the config file pathname. -$propertyfile = "$siteroot/bin/admin/admin/bin/property/monreplication.properties"; -$edit1 = "s#monreplication2=.*#monreplication2=$cgiVars{'refreshinterval'}#;"; -$edit2 = "s#^monreplication3=.*#monreplication3=$cgiVars{'configfile'}#;"; -system("$perl -p -i.bak -e \"$edit1\" -e \"$edit2\" $propertyfile"); +my $admurl = "http://"; +if ($ENV{HTTPS} and (lc($ENV{HTTPS}) eq "on")) { + $admurl = "https://"; +} +$admurl .= $ENV{HTTP_HOST} . $ENV{SCRIPT_NAME} . "?refreshinterval=$refreshinterval"; +push @ARGV, '-u', $admurl; + +if ($configfile and -f $configfile) { + # have to grab the first host from it + if (open(CONFFILE, $configfile)) { + while (<CONFFILE>) { + next if (/^\#/); # skip comments + next if (/^\s*$/); # skip blank lines + next if (/^\[/); # skip sections + my ($host, $port, $rest) = split(/:/); + push @ARGV, '-h', $host; + push @ARGV, '-p', $port; + last; + } + close CONFFILE; + } +} # Now the real work $replmon = "$siteroot/bin/slapd/admin/scripts/template-repl-monitor.pl"; -system("$perl $replmon $params"); +exec $perl, $replmon, @ARGV;

1 0

[Fedora-directory-commits] ldapserver/ldap/cm/newinst ns-update, 1.6, 1.6.2.1
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4673/ldap/cm/newinst Modified Files: Tag: Directory71RtmBranch ns-update Log Message: Resolves: RHSA-2008:0199 Description: A shell command injection flaw in the Red Hat Administration Server replication monitor CGI script could be exploited by an attacker to execute arbitrary shell commands with root privileges. Index: ns-update =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Attic/ns-update,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- ns-update 19 Apr 2005 22:07:20 -0000 1.6 +++ ns-update 30 Apr 2008 18:28:30 -0000 1.6.2.1 @@ -169,6 +169,13 @@ start_server $sroot $dir echo "" done + # fixup any admin server files + if [ -f $sroot/bin/admin/admin/bin/repl-monitor-cgi.pl.backup ] ; then + echo Already have repl-monitor-cgi.pl patch, skipping . . . + else + cp -f -p $sroot/bin/admin/admin/bin/repl-monitor-cgi.pl $sroot/bin/admin/admin/bin/repl-monitor-cgi.pl.backup + cp -f -p $sroot/bin/slapd/admin/scripts/template-repl-monitor-cgi.pl $sroot/bin/admin/admin/bin/repl-monitor-cgi.pl + fi fi wrap_security_tools $sroot

1 0

[Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.19, 1.1.2.20 redhat-patch.inf, 1.1.2.20, 1.1.2.21
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4673/ldap/cm Modified Files: Tag: Directory71RtmBranch fedora-patch.inf redhat-patch.inf Log Message: Resolves: RHSA-2008:0199 Description: A shell command injection flaw in the Red Hat Administration Server replication monitor CGI script could be exploited by an attacker to execute arbitrary shell commands with root privileges. Index: fedora-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/fedora-patch.inf,v retrieving revision 1.1.2.19 retrieving revision 1.1.2.20 diff -u -r1.1.2.19 -r1.1.2.20 --- fedora-patch.inf 26 Jan 2008 01:53:35 -0000 1.1.2.19 +++ fedora-patch.inf 30 Apr 2008 18:28:30 -0000 1.1.2.20 @@ -46,8 +46,13 @@ # 32it: # %DISTDIR32% points <buildroot>/dist/<platform> # +# Changes for 7.1 SP5 +# added files for bug 437301 +# base: ... +file: 437301: bin/slapd/admin/scripts/template-repl-monitor-cgi.pl +file: 437301: bin/slapd/admin/bin/ns-update file: 147585: plugins/slapd/slapi/examples/testpreop.c file: 164834,165641,166229,173687,175063,202890,247725,297221,196523,208058,311851,240583: bin/slapd/server/ns-slapd file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221,240897,428764: bin/slapd/server/libslapd.* Index: redhat-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/redhat-patch.inf,v retrieving revision 1.1.2.20 retrieving revision 1.1.2.21 diff -u -r1.1.2.20 -r1.1.2.21 --- redhat-patch.inf 26 Jan 2008 01:53:35 -0000 1.1.2.20 +++ redhat-patch.inf 30 Apr 2008 18:28:30 -0000 1.1.2.21 @@ -46,8 +46,13 @@ # 32it: # %DISTDIR32% points <buildroot>/dist/<platform> # +# Changes for 7.1 SP5 +# added files for bug 437301 +# base: /share/builds/products/server/directry/7.1 +file: 437301: bin/slapd/admin/scripts/template-repl-monitor-cgi.pl +file: 437301: bin/slapd/admin/bin/ns-update file: 147585: plugins/slapd/slapi/examples/testpreop.c file: 164834,165641,166229,173687,175063,202890,247725,297221,196523,208058,311851,240583: bin/slapd/server/ns-slapd file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221,240897,428764: bin/slapd/server/libslapd.*

1 0

[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.10.2.12, 1.10.2.13
by Doctor Conrad 30 Apr '08

30 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4673 Modified Files: Tag: Directory71RtmBranch ldapserver.spec.tmpl Log Message: Resolves: RHSA-2008:0199 Description: A shell command injection flaw in the Red Hat Administration Server replication monitor CGI script could be exploited by an attacker to execute arbitrary shell commands with root privileges. Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/Attic/ldapserver.spec.tmpl,v retrieving revision 1.10.2.12 retrieving revision 1.10.2.13 diff -u -r1.10.2.12 -r1.10.2.13 --- ldapserver.spec.tmpl 29 Feb 2008 22:27:06 -0000 1.10.2.12 +++ ldapserver.spec.tmpl 30 Apr 2008 18:28:23 -0000 1.10.2.13 @@ -45,7 +45,7 @@ Summary: @COMPANY-PRODUCT-NAME@ Name: @LCASE-COMPANY-NAME-NOSP@-ds Version: @GEN-VERSION@ -Release: 7.@PLATFORM@ +Release: 8.@PLATFORM@ License: GPL plus extensions Group: System Environment/Daemons URL: @COMPANY-URL@ @@ -136,6 +136,9 @@ fi %changelog +* Fri Mar 14 2008 Rich Megginson <rmeggins(a)redhat.com> 7.1-4-8 +- initial commit for sp5 + * Fri Feb 29 2008 Noriko Hosoi <nhosoi(a)redhat.com> 7.1-4-7 - fixed the mode of java/jars

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/plugins/syntaxes string.c, 1.9, 1.10
by Doctor Conrad 28 Apr '08

28 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20689/plugins/syntaxes Modified Files: string.c Log Message: Resolves: #182621 (#443955) Summary: Allow larger regex buffer to enable long substring filters Description: Applying the patches provided by ulf.weltman(a)hp.com. regex.c: use dynamically allocated regex buffer, use ptrdiff_t to store the offsets to be restored after the realloc, and use a constant for the value of "how much the NFA buffer can grow in one iteration on the pattern". string.c: use dynamically allocated buffer if the prepared buffer is not large enough, used wrong pointer (pat instead of p) in a debug message, and performed an unneeded strcat of ".*" Index: string.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/string.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- string.c 28 Sep 2007 23:46:40 -0000 1.9 +++ string.c 29 Apr 2008 00:38:36 -0000 1.10 @@ -189,8 +189,8 @@ string_filter_sub( Slapi_PBlock *pb, char *initial, char **any, char *final, Slapi_Value **bvals, int syntax ) { - int i, j, rc; - char *p, *end, *realval, *tmpbuf; + int i, j, rc, size=0; + char *p, *end, *realval, *tmpbuf, *bigpat = NULL; size_t tmpbufsize; char pat[BUFSIZ]; char buf[BUFSIZ]; @@ -198,7 +198,6 @@ LDAPDebug( LDAP_DEBUG_FILTER, "=> string_filter_sub\n", 0, 0, 0 ); - /* * construct a regular expression corresponding to the * filter and let regex do the work for each value @@ -207,16 +206,33 @@ pat[0] = '\0'; p = pat; end = pat + sizeof(pat) - 2; /* leave room for null */ + if ( initial != NULL ) { - value_normalize( initial, syntax, 1 /* trim leading blanks */ ); - strcpy( p, "^" ); - p = strchr( p, '\0' ); - /* 2 * in case every char is special */ - if ( p + 2 * strlen( initial ) > end ) { - LDAPDebug( LDAP_DEBUG_ANY, "not enough pattern space\n", - 0, 0, 0 ); - return( -1 ); + size = strlen( initial ) + 1; /* add 1 for "^" */ + } + + if ( any != NULL ) { + i = 0; + while ( any[i] ) { + size += strlen(any[i++]) + 2; /* add 2 for ".*" */ } + } + + if ( final != NULL ) { + size += strlen( final ) + 3; /* add 3 for ".*" and "$" */ + } + + size *= 2; /* doubled in case all filter chars need escaping */ + size++; /* add 1 for null */ + + if ( p + size > end ) { + bigpat = slapi_ch_malloc( size ); + p = bigpat; + } + + if ( initial != NULL ) { + value_normalize( initial, syntax, 1 /* trim leading blanks */ ); + *p++ = '^'; filter_strcpy_special( p, initial ); p = strchr( p, '\0' ); } @@ -224,13 +240,8 @@ for ( i = 0; any[i] != NULL; i++ ) { value_normalize( any[i], syntax, 0 /* DO NOT trim leading blanks */ ); /* ".*" + value */ - if ( p + 2 * strlen( any[i] ) + 2 > end ) { - LDAPDebug( LDAP_DEBUG_ANY, - "not enough pattern space\n", 0, 0, 0 ); - return( -1 ); - } - strcpy( p, ".*" ); - p = strchr( p, '\0' ); + *p++ = '.'; + *p++ = '*'; filter_strcpy_special( p, any[i] ); p = strchr( p, '\0' ); } @@ -238,28 +249,26 @@ if ( final != NULL ) { value_normalize( final, syntax, 0 /* DO NOT trim leading blanks */ ); /* ".*" + value */ - if ( p + 2 * strlen( final ) + 2 > end ) { - LDAPDebug( LDAP_DEBUG_ANY, "not enough pattern space\n", - 0, 0, 0 ); - return( -1 ); - } - strcpy( p, ".*" ); - p = strchr( p, '\0' ); + *p++ = '.'; + *p++ = '*'; filter_strcpy_special( p, final ); - p = strchr( p, '\0' ); - strcpy( p, "$" ); + strcat( p, "$" ); } /* compile the regex */ + p = (bigpat) ? bigpat : pat; slapd_re_lock(); - if ( (p = slapd_re_comp( pat )) != 0 ) { + if ( (tmpbuf = slapd_re_comp( p )) != 0 ) { LDAPDebug( LDAP_DEBUG_ANY, "re_comp (%s) failed (%s)\n", pat, p, 0 ); slapd_re_unlock(); - return( -1 ); + if( bigpat != NULL ) { + slapi_ch_free((void**)&bigpat ); + } + return( LDAP_OPERATIONS_ERROR ); } else { - LDAPDebug( LDAP_DEBUG_TRACE, "re_comp (%s)\n", - escape_string( pat, ebuf ), 0, 0 ); + LDAPDebug( LDAP_DEBUG_TRACE, "re_comp (%s)\n", + escape_string( p, ebuf ), 0, 0 ); } /* @@ -300,6 +309,9 @@ if ( tmpbuf != NULL ) { slapi_ch_free((void**)&tmpbuf ); } + if( bigpat != NULL ) { + slapi_ch_free((void**)&bigpat ); + } LDAPDebug( LDAP_DEBUG_FILTER, "<= string_filter_sub %d\n", rc, 0, 0 );

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd regex.c, 1.5, 1.6
by Doctor Conrad 28 Apr '08

28 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20689/slapd Modified Files: regex.c Log Message: Resolves: #182621 (#443955) Summary: Allow larger regex buffer to enable long substring filters Description: Applying the patches provided by ulf.weltman(a)hp.com. regex.c: use dynamically allocated regex buffer, use ptrdiff_t to store the offsets to be restored after the realloc, and use a constant for the value of "how much the NFA buffer can grow in one iteration on the pattern". string.c: use dynamically allocated buffer if the prepared buffer is not large enough, used wrong pointer (pat instead of p) in a debug message, and performed an unneeded strcat of ".*" Index: regex.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/regex.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- regex.c 10 Nov 2006 23:45:40 -0000 1.5 +++ regex.c 29 Apr 2008 00:38:36 -0000 1.6 @@ -43,31 +43,6 @@ #include "slap.h" /* must come before regex.h */ #include "portable.h" -static PRLock *regex_mutex = NULL; - -int -slapd_re_init( void ) -{ - if ( NULL == regex_mutex ) { - regex_mutex = PR_NewLock(); - } - return( NULL == regex_mutex ? -1 : 0 ); -} - -void -slapd_re_lock( void ) -{ - PR_ASSERT( NULL != regex_mutex ); - PR_Lock( regex_mutex ); -} - -int -slapd_re_unlock( void ) -{ - PR_ASSERT( NULL != regex_mutex ); - return( PR_Unlock( regex_mutex ) ); -} - #if defined( MACOS ) || defined( DOS ) || defined( _WIN32 ) || defined( NEED_BSDREGEX ) #include "regex.h" @@ -91,6 +66,13 @@ * Modification history: * * $Log$ + * Revision 1.6 2008/04/29 00:38:36 nhosoi + * Resolves: #182621 (#443955) + * Summary: Allow larger regex buffer to enable long substring filters + * Description: Applying the patches provided by ulf.weltman(a)hp.com. + * regex.c: use dynamically allocated regex buffer, use ptrdiff_t to store the offsets to be restored after the realloc, and use a constant for the value of "how much the NFA buffer can grow in one iteration on the pattern". + * string.c: use dynamically allocated buffer if the prepared buffer is not large enough, used wrong pointer (pat instead of p) in a debug message, and performed an unneeded strcat of ".*" + * * Revision 1.5 2006/11/10 23:45:40 nhosoi * Resolves: #214533 * Summary: configure needs to support --with-fhs (Comment #6) @@ -416,6 +398,12 @@ * matches: foo-foo fo-fo fob-fob foobar-foobar ... */ +/* This is the maximum the NFA buffer might grow for every op code processed. + The max seems to be the + after a character class, like "[a-z]+". It + needs 1 byte for the CCL code, 16 for the CCL bit map, and 2 for END codes + and 1 for a CLO code. */ +#define MAXOPSPACE 20 + #define MAXNFA 1024 #define MAXTAG 10 @@ -454,11 +442,12 @@ */ static int tagstk[MAXTAG]; /* subpat tag stack..*/ -static UCHAR nfa[MAXNFA]; /* automaton.. */ -static int sta = NOP; /* status of lastpat */ +static UCHAR *nfa = NULL; /* automaton.. */ +static int nfasize = MAXNFA; /* tracks size of nfa buffer */ +static int sta = NOP; /* status of lastpat */ -static UCHAR bittab[BITBLK]; /* bit table for CCL */ - /* pre-set bits... */ +static UCHAR bittab[BITBLK]; /* bit table for CCL */ + /* pre-set bits... */ static UCHAR bitarr[] = {1,2,4,8,16,32,64,128}; #ifdef DEBUG @@ -498,6 +487,21 @@ sta = NOP; for (p = (UCHAR*)pat; *p; p++) { + /* Check if we are approaching end of nfa buffer. MAXOPSPACE is + the max we might add to the nfa per loop. */ + if (mp - (UCHAR*)nfa + MAXOPSPACE >= nfasize) { + /* Save offsets */ + ptrdiff_t mppos = mp - nfa; + ptrdiff_t sppos = sp - nfa; + + /* Double the nfa buffer size */ + nfasize *= 2; + nfa = (UCHAR*)slapi_ch_realloc((char*)nfa, nfasize); + + /* Restore pointers into realloced space */ + mp = nfa + mppos; + sp = nfa + sppos; + } lp = mp; switch(*p) { @@ -1099,3 +1103,33 @@ } #endif #endif /* MACOS or DOS or NEED_BSDREGEX */ + +static PRLock *regex_mutex = NULL; + +int +slapd_re_init( void ) +{ + if ( NULL == regex_mutex ) { + regex_mutex = PR_NewLock(); + } + + if ( NULL == nfa ) { + nfa = (UCHAR*)slapi_ch_malloc( MAXNFA ); + } + + return( NULL == regex_mutex ? -1 : 0 ); +} + +void +slapd_re_lock( void ) +{ + PR_ASSERT( NULL != regex_mutex ); + PR_Lock( regex_mutex ); +} + +int +slapd_re_unlock( void ) +{ + PR_ASSERT( NULL != regex_mutex ); + return( PR_Unlock( regex_mutex ) ); +}

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/plugins/syntaxes string.c, 1.9, 1.9.2.1
by Doctor Conrad 28 Apr '08

28 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20452/plugins/syntaxes Modified Files: Tag: Directory_Server_8_0_Branch string.c Log Message: Resolves: #182621 (#443955) Summary: Allow larger regex buffer to enable long substring filters Description: Applying the patches provided by ulf.weltman(a)hp.com. regex.c: use dynamically allocated regex buffer, use ptrdiff_t to store the offsets to be restored after the realloc, and use a constant for the value of "how much the NFA buffer can grow in one iteration on the pattern". string.c: use dynamically allocated buffer if the prepared buffer is not large enough, used wrong pointer (pat instead of p) in a debug message, and performed an unneeded strcat of ".*" Index: string.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/string.c,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -r1.9 -r1.9.2.1 --- string.c 28 Sep 2007 23:46:40 -0000 1.9 +++ string.c 29 Apr 2008 00:38:00 -0000 1.9.2.1 @@ -189,8 +189,8 @@ string_filter_sub( Slapi_PBlock *pb, char *initial, char **any, char *final, Slapi_Value **bvals, int syntax ) { - int i, j, rc; - char *p, *end, *realval, *tmpbuf; + int i, j, rc, size=0; + char *p, *end, *realval, *tmpbuf, *bigpat = NULL; size_t tmpbufsize; char pat[BUFSIZ]; char buf[BUFSIZ]; @@ -198,7 +198,6 @@ LDAPDebug( LDAP_DEBUG_FILTER, "=> string_filter_sub\n", 0, 0, 0 ); - /* * construct a regular expression corresponding to the * filter and let regex do the work for each value @@ -207,16 +206,33 @@ pat[0] = '\0'; p = pat; end = pat + sizeof(pat) - 2; /* leave room for null */ + if ( initial != NULL ) { - value_normalize( initial, syntax, 1 /* trim leading blanks */ ); - strcpy( p, "^" ); - p = strchr( p, '\0' ); - /* 2 * in case every char is special */ - if ( p + 2 * strlen( initial ) > end ) { - LDAPDebug( LDAP_DEBUG_ANY, "not enough pattern space\n", - 0, 0, 0 ); - return( -1 ); + size = strlen( initial ) + 1; /* add 1 for "^" */ + } + + if ( any != NULL ) { + i = 0; + while ( any[i] ) { + size += strlen(any[i++]) + 2; /* add 2 for ".*" */ } + } + + if ( final != NULL ) { + size += strlen( final ) + 3; /* add 3 for ".*" and "$" */ + } + + size *= 2; /* doubled in case all filter chars need escaping */ + size++; /* add 1 for null */ + + if ( p + size > end ) { + bigpat = slapi_ch_malloc( size ); + p = bigpat; + } + + if ( initial != NULL ) { + value_normalize( initial, syntax, 1 /* trim leading blanks */ ); + *p++ = '^'; filter_strcpy_special( p, initial ); p = strchr( p, '\0' ); } @@ -224,13 +240,8 @@ for ( i = 0; any[i] != NULL; i++ ) { value_normalize( any[i], syntax, 0 /* DO NOT trim leading blanks */ ); /* ".*" + value */ - if ( p + 2 * strlen( any[i] ) + 2 > end ) { - LDAPDebug( LDAP_DEBUG_ANY, - "not enough pattern space\n", 0, 0, 0 ); - return( -1 ); - } - strcpy( p, ".*" ); - p = strchr( p, '\0' ); + *p++ = '.'; + *p++ = '*'; filter_strcpy_special( p, any[i] ); p = strchr( p, '\0' ); } @@ -238,28 +249,26 @@ if ( final != NULL ) { value_normalize( final, syntax, 0 /* DO NOT trim leading blanks */ ); /* ".*" + value */ - if ( p + 2 * strlen( final ) + 2 > end ) { - LDAPDebug( LDAP_DEBUG_ANY, "not enough pattern space\n", - 0, 0, 0 ); - return( -1 ); - } - strcpy( p, ".*" ); - p = strchr( p, '\0' ); + *p++ = '.'; + *p++ = '*'; filter_strcpy_special( p, final ); - p = strchr( p, '\0' ); - strcpy( p, "$" ); + strcat( p, "$" ); } /* compile the regex */ + p = (bigpat) ? bigpat : pat; slapd_re_lock(); - if ( (p = slapd_re_comp( pat )) != 0 ) { + if ( (tmpbuf = slapd_re_comp( p )) != 0 ) { LDAPDebug( LDAP_DEBUG_ANY, "re_comp (%s) failed (%s)\n", pat, p, 0 ); slapd_re_unlock(); - return( -1 ); + if( bigpat != NULL ) { + slapi_ch_free((void**)&bigpat ); + } + return( LDAP_OPERATIONS_ERROR ); } else { - LDAPDebug( LDAP_DEBUG_TRACE, "re_comp (%s)\n", - escape_string( pat, ebuf ), 0, 0 ); + LDAPDebug( LDAP_DEBUG_TRACE, "re_comp (%s)\n", + escape_string( p, ebuf ), 0, 0 ); } /* @@ -300,6 +309,9 @@ if ( tmpbuf != NULL ) { slapi_ch_free((void**)&tmpbuf ); } + if( bigpat != NULL ) { + slapi_ch_free((void**)&bigpat ); + } LDAPDebug( LDAP_DEBUG_FILTER, "<= string_filter_sub %d\n", rc, 0, 0 );

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd regex.c, 1.5, 1.5.2.1
by Doctor Conrad 28 Apr '08

28 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20452/slapd Modified Files: Tag: Directory_Server_8_0_Branch regex.c Log Message: Resolves: #182621 (#443955) Summary: Allow larger regex buffer to enable long substring filters Description: Applying the patches provided by ulf.weltman(a)hp.com. regex.c: use dynamically allocated regex buffer, use ptrdiff_t to store the offsets to be restored after the realloc, and use a constant for the value of "how much the NFA buffer can grow in one iteration on the pattern". string.c: use dynamically allocated buffer if the prepared buffer is not large enough, used wrong pointer (pat instead of p) in a debug message, and performed an unneeded strcat of ".*" Index: regex.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/regex.c,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -r1.5 -r1.5.2.1 --- regex.c 10 Nov 2006 23:45:40 -0000 1.5 +++ regex.c 29 Apr 2008 00:38:00 -0000 1.5.2.1 @@ -43,31 +43,6 @@ #include "slap.h" /* must come before regex.h */ #include "portable.h" -static PRLock *regex_mutex = NULL; - -int -slapd_re_init( void ) -{ - if ( NULL == regex_mutex ) { - regex_mutex = PR_NewLock(); - } - return( NULL == regex_mutex ? -1 : 0 ); -} - -void -slapd_re_lock( void ) -{ - PR_ASSERT( NULL != regex_mutex ); - PR_Lock( regex_mutex ); -} - -int -slapd_re_unlock( void ) -{ - PR_ASSERT( NULL != regex_mutex ); - return( PR_Unlock( regex_mutex ) ); -} - #if defined( MACOS ) || defined( DOS ) || defined( _WIN32 ) || defined( NEED_BSDREGEX ) #include "regex.h" @@ -91,6 +66,17 @@ * Modification history: * * $Log$ + * Revision 1.5.2.1 2008/04/29 00:38:00 nhosoi + * Resolves: #182621 (#443955) + * Summary: Allow larger regex buffer to enable long substring filters + * Description: Applying the patches provided by ulf.weltman(a)hp.com. + * regex.c: use dynamically allocated regex buffer, use ptrdiff_t to store + * the offsets to be restored after the realloc, and use a constant for the + * value of "how much the NFA buffer can grow in one iteration on the pattern". + * string.c: use dynamically allocated buffer if the prepared buffer is not + * large enough, used wrong pointer (pat instead of p) in a debug message, + * and performed an unneeded strcat of ".*" + * * Revision 1.5 2006/11/10 23:45:40 nhosoi * Resolves: #214533 * Summary: configure needs to support --with-fhs (Comment #6) @@ -416,6 +402,12 @@ * matches: foo-foo fo-fo fob-fob foobar-foobar ... */ +/* This is the maximum the NFA buffer might grow for every op code processed. + The max seems to be the + after a character class, like "[a-z]+". It + needs 1 byte for the CCL code, 16 for the CCL bit map, and 2 for END codes + and 1 for a CLO code. */ +#define MAXOPSPACE 20 + #define MAXNFA 1024 #define MAXTAG 10 @@ -454,11 +446,12 @@ */ static int tagstk[MAXTAG]; /* subpat tag stack..*/ -static UCHAR nfa[MAXNFA]; /* automaton.. */ -static int sta = NOP; /* status of lastpat */ +static UCHAR *nfa = NULL; /* automaton.. */ +static int nfasize = MAXNFA; /* tracks size of nfa buffer */ +static int sta = NOP; /* status of lastpat */ -static UCHAR bittab[BITBLK]; /* bit table for CCL */ - /* pre-set bits... */ +static UCHAR bittab[BITBLK]; /* bit table for CCL */ + /* pre-set bits... */ static UCHAR bitarr[] = {1,2,4,8,16,32,64,128}; #ifdef DEBUG @@ -498,6 +491,21 @@ sta = NOP; for (p = (UCHAR*)pat; *p; p++) { + /* Check if we are approaching end of nfa buffer. MAXOPSPACE is + the max we might add to the nfa per loop. */ + if (mp - (UCHAR*)nfa + MAXOPSPACE >= nfasize) { + /* Save offsets */ + ptrdiff_t mppos = mp - nfa; + ptrdiff_t sppos = sp - nfa; + + /* Double the nfa buffer size */ + nfasize *= 2; + nfa = (UCHAR*)slapi_ch_realloc((char*)nfa, nfasize); + + /* Restore pointers into realloced space */ + mp = nfa + mppos; + sp = nfa + sppos; + } lp = mp; switch(*p) { @@ -1099,3 +1107,33 @@ } #endif #endif /* MACOS or DOS or NEED_BSDREGEX */ + +static PRLock *regex_mutex = NULL; + +int +slapd_re_init( void ) +{ + if ( NULL == regex_mutex ) { + regex_mutex = PR_NewLock(); + } + + if ( NULL == nfa ) { + nfa = (UCHAR*)slapi_ch_malloc( MAXNFA ); + } + + return( NULL == regex_mutex ? -1 : 0 ); +} + +void +slapd_re_lock( void ) +{ + PR_ASSERT( NULL != regex_mutex ); + PR_Lock( regex_mutex ); +} + +int +slapd_re_unlock( void ) +{ + PR_ASSERT( NULL != regex_mutex ); + return( PR_Unlock( regex_mutex ) ); +}

1 0

[Fedora-directory-commits] dsmlgw/src/com/netscape/dsml/gateway Configuration.java, 1.2, 1.3
by Doctor Conrad 25 Apr '08

25 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2523/dsmlgw/src/com/netscape/dsml/gateway Modified Files: Configuration.java Log Message: change log level from WARNING to CONFIG Index: Configuration.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/Configuration.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Configuration.java 18 Apr 2008 16:43:39 -0000 1.2 +++ Configuration.java 25 Apr 2008 21:04:37 -0000 1.3 @@ -144,7 +144,7 @@ } catch (java.io.FileNotFoundException e) { - logger.log(Level.WARNING, "Can't find properties file: " + propertiesFilename); + logger.log(Level.CONFIG, "Can't find properties file: " + propertiesFilename); throw e; } catch (java.io.IOException e) {

1 0

[Fedora-directory-commits] dsmlgw/scripts dsml2ldif.in, NONE, 1.1 ldif2dsml.in, NONE, 1.1
by Doctor Conrad 24 Apr '08

24 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28804/dsmlgw/scripts Added Files: dsml2ldif.in ldif2dsml.in Log Message: added dsml2ldif and ldif2dsml scripts --- NEW FILE dsml2ldif.in --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # CP=@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/dsmlgw.jar:@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/ldapjdk.jar # it seems that most java 1.5 and later JREs already have a built-in sax implementation # if you need to specify another one, just specify the SAXJARS env var # SAXJARS=/path/to/xml-parser.jar dsml2ldif file.dsml if [ -n "$SAXJARS" ] ; then CP=${CP}:$SAXJARS fi @runtime_javahome@/bin/java -cp "$CP" com.netscape.xmltools.DSML2LDIF "$@" --- NEW FILE ldif2dsml.in --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # CP=@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/dsmlgw.jar:@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/ldapjdk.jar # it seems that most java 1.5 and later JREs already have a built-in sax implementation # if you need to specify another one, just specify the SAXJARS env var # SAXJARS=/path/to/xml-parser.jar dsml2ldif file.dsml if [ -n "$SAXJARS" ] ; then CP=${CP}:$SAXJARS fi @runtime_javahome@/bin/java -cp "$CP" com.netscape.xmltools.LDIF2DSML "$@"

1 0

[Fedora-directory-commits] dsmlgw build.xml,1.8,1.9
by Doctor Conrad 24 Apr '08

24 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28804/dsmlgw Modified Files: build.xml Log Message: added dsml2ldif and ldif2dsml scripts Index: build.xml =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- build.xml 24 Apr 2008 21:52:40 -0000 1.8 +++ build.xml 25 Apr 2008 02:28:09 -0000 1.9 @@ -220,6 +220,12 @@ <copyfilter file="scripts/dsmlgw-search.in" tofile="${pkg.dir}${dsmlgwbindir}/dsmlgw-search"/> <chmod file="${pkg.dir}${dsmlgwbindir}/dsmlgw-search" perm="0755"/> + <copyfilter file="scripts/dsml2ldif.in" + tofile="${pkg.dir}${dsmlgwbindir}/dsml2ldif"/> + <chmod file="${pkg.dir}${dsmlgwbindir}/dsml2ldif" perm="0755"/> + <copyfilter file="scripts/ldif2dsml.in" + tofile="${pkg.dir}${dsmlgwbindir}/ldif2dsml"/> + <chmod file="${pkg.dir}${dsmlgwbindir}/ldif2dsml" perm="0755"/> <copy file="misc/dsmlgw.cfg" todir="${pkg.dir}${dsmlgwconfigdir}"/> <chmod file="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.cfg" perm="0644"/> <copy todir="${pkg.dir}${dsmlgwdatadir}/data">

1 0

[Fedora-directory-commits] dsmlgw build.xml,1.7,1.8
by Doctor Conrad 24 Apr '08

24 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18678/dsmlgw Modified Files: build.xml Log Message: added dsml data files to package - fix minor bugs in dsmlgw-search Index: build.xml =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- build.xml 24 Apr 2008 21:39:10 -0000 1.7 +++ build.xml 24 Apr 2008 21:52:40 -0000 1.8 @@ -196,6 +196,7 @@ <target name="makepkg" description="create the distribution package" depends="makewar"> <mkdir dir="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/> + <mkdir dir="${pkg.dir}${dsmlgwdatadir}/data"/> <mkdir dir="${pkg.dir}${dsmlgwconfigdir}"/> <mkdir dir="${pkg.dir}${dsmlgwlogdir}"/> <mkdir dir="${pkg.dir}${dsmlgwrundir}"/> @@ -221,6 +222,11 @@ <chmod file="${pkg.dir}${dsmlgwbindir}/dsmlgw-search" perm="0755"/> <copy file="misc/dsmlgw.cfg" todir="${pkg.dir}${dsmlgwconfigdir}"/> <chmod file="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.cfg" perm="0644"/> + <copy todir="${pkg.dir}${dsmlgwdatadir}/data"> + <fileset dir="dsml"> + <include name="*.dsml"/> + </fileset> + </copy> <tar destfile="${dist.dir}/${ant.project.name}-${version}.tar" basedir="${pkg.dir}"/> <gzip zipfile="${dist.dir}/${ant.project.name}-${version}.tar.gz"

1 0

[Fedora-directory-commits] dsmlgw/scripts dsmlgw-search.in,1.1,1.2
by Doctor Conrad 24 Apr '08

24 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18678/dsmlgw/scripts Modified Files: dsmlgw-search.in Log Message: added dsml data files to package - fix minor bugs in dsmlgw-search Index: dsmlgw-search.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/dsmlgw-search.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dsmlgw-search.in 24 Apr 2008 21:39:10 -0000 1.1 +++ dsmlgw-search.in 24 Apr 2008 21:52:41 -0000 1.2 @@ -31,7 +31,7 @@ base=no_suffix_supplied filter='(objectclass=*)' -while [ "$1" ] ; do +while [ -n "$1" ] ; do case "$1" in -h) shift; hostname="$1" ;; -p) shift; port="$1" ;; @@ -67,9 +67,9 @@ <filter><present name="objectclass"/></filter> EOF -if [ "$1" ] ; then +if [ -n "$1" ] ; then echo "<attributes>" >> $tmpdsml - while [ "$1" ] ; do + while [ -n "$1" ] ; do echo "<attribute name="\"$1\""/>" >> $tmpdsml shift done @@ -85,7 +85,7 @@ dsmlgwlibdir=@dsmlgwdatadir@/webapps/axis/WEB-INF/lib for file in $dsmlgwlibdir/*.jar ; do - if [ "$AXISCP" ] ; then + if [ -n "$AXISCP" ] ; then AXISCP=${AXISCP}:$file else AXISCP=$file

1 0

[Fedora-directory-commits] dsmlgw/misc dsmlgw.env.in, 1.1, NONE restart-ds-dsmlgw.in, 1.1, NONE setup-ds-dsmlgw.in, 1.3, NONE start-ds-dsmlgw.in, 1.4, NONE stop-ds-dsmlgw.in, 1.1, NONE
by Doctor Conrad 24 Apr '08

24 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/misc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18285/dsmlgw/misc Removed Files: dsmlgw.env.in restart-ds-dsmlgw.in setup-ds-dsmlgw.in start-ds-dsmlgw.in stop-ds-dsmlgw.in Log Message: move scripts to new scripts directory - add very simple dsmlgw-search script to test dsmlgw - remove some error messages --- dsmlgw.env.in DELETED --- --- restart-ds-dsmlgw.in DELETED --- --- setup-ds-dsmlgw.in DELETED --- --- start-ds-dsmlgw.in DELETED --- --- stop-ds-dsmlgw.in DELETED ---

1 0

[Fedora-directory-commits] dsmlgw/src/com/netscape/dsml/gateway gatewayHandler.java, 1.2, 1.3
by Doctor Conrad 24 Apr '08

24 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18285/dsmlgw/src/com/netscape/dsml/gateway Modified Files: gatewayHandler.java Log Message: move scripts to new scripts directory - add very simple dsmlgw-search script to test dsmlgw - remove some error messages Index: gatewayHandler.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gatewayHandler.java 18 Apr 2008 16:43:39 -0000 1.2 +++ gatewayHandler.java 24 Apr 2008 21:39:11 -0000 1.3 @@ -41,11 +41,11 @@ public gatewayHandler() { super(); - System.err.println("gatewayHandler.gatewayHandler: logger class " + - "is " + logger.getClass().getCanonicalName() + - " logger name is " + logger.getName() + - " parent class is " + logger.getParent().getClass().getCanonicalName() + - " parent name is " + logger.getParent().getName()); +// System.err.println("gatewayHandler.gatewayHandler: logger class " + +// "is " + logger.getClass().getCanonicalName() + +// " logger name is " + logger.getName() + +// " parent class is " + logger.getParent().getClass().getCanonicalName() + +// " parent name is " + logger.getParent().getName()); logger.entering("gatewayHandler", "gatewayHandler"); try {

1 0

[Fedora-directory-commits] dsmlgw/scripts dsmlgw-search.in, NONE, 1.1 dsmlgw.env.in, NONE, 1.1 restart-ds-dsmlgw.in, NONE, 1.1 setup-ds-dsmlgw.in, NONE, 1.1 start-ds-dsmlgw.in, NONE, 1.1 stop-ds-dsmlgw.in, NONE, 1.1
by Doctor Conrad 24 Apr '08

24 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18285/dsmlgw/scripts Added Files: dsmlgw-search.in dsmlgw.env.in restart-ds-dsmlgw.in setup-ds-dsmlgw.in start-ds-dsmlgw.in stop-ds-dsmlgw.in Log Message: move scripts to new scripts directory - add very simple dsmlgw-search script to test dsmlgw - remove some error messages --- NEW FILE dsmlgw-search.in --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # usage() { echo $1 echo Usage: $0 [-h host] [-p port] [-s scope] [-b base] [filter] [attributes . . .] exit 1 } hostname=localhost port=8081 scope=sub base=no_suffix_supplied filter='(objectclass=*)' while [ "$1" ] ; do case "$1" in -h) shift; hostname="$1" ;; -p) shift; port="$1" ;; -s) shift; scope="$1" ;; -b) shift; base="$1" ;; *) filter="$1"; shift; break;; esac shift done #echo $0 -h $hostname -p $port -s $scope -b $base \"$filter\" "$@" dsmlscope=wholeSubtree case "$scope" in base) dsmlscope=baseObject ;; one) dsmlscope=singleLevel ;; sub) dsmlscope=wholeSubtree ;; esac tmpdsml=/tmp/dsml.$$ cat > $tmpdsml <<EOF <?xml version='1.0' encoding='UTF-8'?> <soap-env:Envelope xmlns:soap-env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <soap-env:Body> <batchRequest xmlns="urn:oasis:names:tc:DSML:2:0:core"> <searchRequest dn="$base" scope="$scope" derefAliases="neverDerefAliases"> <filter><present name="objectclass"/></filter> EOF if [ "$1" ] ; then echo "<attributes>" >> $tmpdsml while [ "$1" ] ; do echo "<attribute name="\"$1\""/>" >> $tmpdsml shift done echo "</attributes>" >> $tmpdsml fi cat >> $tmpdsml <<EOF </searchRequest> </batchRequest> </soap-env:Body> </soap-env:Envelope> EOF dsmlgwlibdir=@dsmlgwdatadir@/webapps/axis/WEB-INF/lib for file in $dsmlgwlibdir/*.jar ; do if [ "$AXISCP" ] ; then AXISCP=${AXISCP}:$file else AXISCP=$file fi done @runtime_javahome@/bin/java -cp "$AXISCP" com.netscape.dsml.test.dsmlSearch http://$hostname:$port/axis/services/dsmlgw $tmpdsml rm -f $tmpdsml --- NEW FILE dsmlgw.env.in --- # This file sets up the environment which the dsmlgw will use if [ -z "$DSMLGW_CONFIG_DIR" ] ; then DSMLGW_CONFIG_DIR=@dsmlgwconfigdir@ export DSMLGW_CONFIG_DIR fi if [ -z "$CATALINA_HOME" ] ; then CATALINA_HOME=@dsmlgwdatadir@ export CATALINA_HOME fi if [ -z "$CATALINA_PID" ] ; then CATALINA_PID=@dsmlgwrundir@/@package_name@.pid export CATALINA_PID fi if [ -z "$TOMCAT_USER" ] ; then TOMCAT_USER=@dsmlgwuser@ export TOMCAT_USER fi if [ -z "$CATALINA_TEMP" ] ; then CATALINA_TEMP=@dsmlgwrundir@/temp export CATALINA_TEMP fi if [ -z "$JAVA_HOME" ] ; then JAVA_HOME=@runtime_javahome@ export JAVA_HOME PATH=$JAVA_HOME/bin:$PATH export PATH fi --- NEW FILE restart-ds-dsmlgw.in --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # @dsmlgwsbindir@/stop-ds-dsmlgw @dsmlgwsbindir@/start-ds-dsmlgw --- NEW FILE setup-ds-dsmlgw.in --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # ########################### # # The general strategy is to create an "instance" of tomcat, so that we # can use our own logs directory, pid directory, etc. and can run as a # user of our choosing rather than the default tomcat user # ########################## echo '######################################################################' echo This shell script will configure the DSML Gateway Axis service, as echo a web application running under Tomcat. echo getValFromInf() { cattr=$1 cfile=$2 rval=`grep ^$cattr $cfile | head -1 | sed -e "s/^$cattr[ ]*=[ ]*//"` echo $rval } getValFromConf() { cattr=$1 cfile=$2 rval=`grep ^$cattr $cfile | head -1 | sed -e "s/^$cattr[ ]*//"` echo $rval } getValFromLdif() { cattr=$1 cfile=$2 num=${3:-1} rval=`grep -i ^$cattr: $cfile | head -$num | sed -e "s/^..*:[ ]*//"` echo $rval } # e.g. /etc/dirsrv/dsmlgw dsmlgwconfigdir="@dsmlgwconfigdir@" dsmlgwlogdir="@dsmlgwlogdir@" dsmlgwrundir="@dsmlgwrundir@" basecfgdir=`dirname $dsmlgwconfigdir` securitydir="@dsmlgwconfigdir@" # see if there is a $dsmlgwconfigdir/../admin-serv admservdir=$basecfgdir/admin-serv if [ -f "$admservdir/local.conf" ] ; then echo Reading parameters from Administration Server config . . . host=`getValFromLdif serverHostName "$admservdir/local.conf"` sec=`getValFromLdif configuration.nsServerSecurity "$admservdir/local.conf"` if [ "$sec" = "on" -a ! -f $securitydir/cert8.db ] ; then cp $admservdir/cert8.db $securitydir fi dsmlgwuser=`ls -l $admservdir/local.conf | awk '{print $3}'` dsmlgwgroup=`ls -l $admservdir/local.conf | awk '{print $4}'` else echo echo '########################################################################' echo Error: It appears the Administration Server has not yet been configured. echo There are configuration files missing from $admservdir echo Please run setup-ds-admin.pl to create your Administration Server echo then run this script again. exit 1 fi # see if there are any directory servers here for dir in $basecfgdir/slapd-* ; do case "$dir" in *.deleted) continue ;; esac if [ -d "$dir" -a -f "$dir/dse.ldif" ] ; then echo Reading parameters from Directory Server $dir . . . dirmgr=`getValFromLdif nsslapd-rootdn "$dir/dse.ldif"` host=`getValFromLdif nsslapd-localhost "$dir/dse.ldif"` sec=`getValFromLdif nsslapd-security "$dir/dse.ldif"` if [ "$sec" = "on" ] ; then port=`getValFromLdif nsslapd-secureport "$dir/dse.ldif"` ldapurl="ldaps://$host:$port" if [ ! -f $securitydir/cert8.db ] ; then cp $dir/cert8.db $securitydir fi else port=`getValFromLdif nsslapd-port "$dir/dse.ldif"` ldapurl="ldap://$host:$port" fi if [ -z "$dsmlgwuser" ] ; then dsmlgwuser=`ls -l $dir/dse.ldif | awk '{print $3}'` fi if [ -z "$dsmlgwgroup" ] ; then dsmlgwgroup=`ls -l $dir/dse.ldif | awk '{print $4}'` fi fi done if [ -n "$ldapurl" ] ; then echo Using Directory Server URL $ldapurl fi # get command line arguments inffile= nextisinffile= reconfig= for arg in "$@" ; do if [ "$arg" = "-r" ]; then reconfig=1 elif [ "$arg" = "-f" ]; then nextisinffile=1 elif [ $nextisinffile ]; then inffile="$arg" nextisinffile= fi done tomcat_home=@tomcat_home@ if [ -z "$tomcat_home" -o ! -d "$tomcat_home" ] ; then echo ERROR: tomcat_home is not set to the tomcat directory exit 1 fi # CATALINA_HOME points to @datadir@/dsmlgw # these are the directories we need in order to run an instance of tomcat # bin server common shared conf temp webapps logs work # these directories will just be symlinks to the actual tomcat dir - they # are mostly read-only: bin server common shared conf # webapps will be a real directory and will contain axis + dsmlgw # logs will point to the dirsrv/dsmlgw logs directory # temp and work will point to the run/dsmlgw directory dsmlgwdir=@dsmlgwdatadir@ for dir in bin server common shared conf ; do if [ -d $dsmlgwdir/$dir ] ; then echo $dsmlgwdir/$dir exists, skipping . . . else ln -s $tomcat_home/$dir $dsmlgwdir/$dir fi done if [ -d $dsmlgwdir/logs ] ; then echo $dsmlgwdir/logs exists, skipping . . . else ln -s @dsmlgwlogdir@ $dsmlgwdir/logs fi for dir in temp work ; do if [ -d $dsmlgwdir/$dir ] ; then echo $dsmlgwdir/$dir exists, skipping . . . else ln -s @dsmlgwrundir@ $dsmlgwdir/$dir fi done # tomcat needs the webapps/ROOT directory too if [ -d $dsmlgwdir/webapps/ROOT ] ; then echo $dsmlgwdir/webapps/ROOT exists, skipping . . . else ln -s $tomcat_home/webapps/ROOT $dsmlgwdir/webapps/ROOT fi if [ -f "$inffile" ] ; then hostname=`getValFromInf FullMachineName $inffile` port=`getValFromInf ServerPort $inffile` dirmgr=`getValFromInf RootDN $inffile` ldapurl="ldap://$host:$port" infuser=`getValFromInf SysUser $inffile` infgroup=`getValFromInf SysGroup $inffile` if [ -z "$infuser" ] ; then infuser=`getValFromInf SuiteSpotUserID $inffile` fi if [ -z "$infgroup" ] ; then infgroup=`getValFromInf SuiteSpotGroup $inffile` fi if [ -n "$infuser" ] ; then dsmlgwuser="$infuser" fi if [ -n "$infgroup" ] ; then dsmlgwgroup="$infgroup" fi echo Using parameters from file $inffile . . . echo Using Directory Server URL $ldapurl . . . fi if [ -z "$reconfig" -a -f $dsmlgwconfigdir/dsmlgw.cfg ] ; then echo echo '######################################################################' echo The DSML Gateway has already been configured. The echo file $dsmlgwconfigdir/dsmlgw.cfg echo exists already. If you want to force a reconfiguration, removing echo your existing configuration and recreating it, run this script echo again with the \"-r\" argument. exit 1 fi echo Generating config file $dsmlgwconfigdir/dsmlgw.cfg . . . # generate dsmlgw.cfg in the $dsmlgwconfigdir directory rm -f $dsmlgwconfigdir/dsmlgw.cfg echo ServerHost=$host > $dsmlgwconfigdir/dsmlgw.cfg echo ServerPort=$port >> $dsmlgwconfigdir/dsmlgw.cfg echo BindDN=$rootdn >> $dsmlgwconfigdir/dsmlgw.cfg echo BindPW= >> $dsmlgwconfigdir/dsmlgw.cfg echo Updating the user information in $dsmlgwconfigdir/dsmlgw.env . . . cp $dsmlgwconfigdir/dsmlgw.env $dsmlgwconfigdir/dsmlgw.env.orig sed -e "s/TOMCAT_USER=.*/TOMCAT_USER=$dsmlgwuser/" $dsmlgwconfigdir/dsmlgw.env.orig > $dsmlgwconfigdir/dsmlgw.env chown -R $dsmlgwuser:$dsmlgwgroup $dsmlgwconfigdir chown -R $dsmlgwuser:$dsmlgwgroup $dsmlgwlogdir chown -R $dsmlgwuser:$dsmlgwgroup $dsmlgwrundir chmod 0400 $dsmlgwconfigdir/dsmlgw.cfg echo echo The DSML Gateway has been successfully configured. echo '######################################################################' exit 0 --- NEW FILE start-ds-dsmlgw.in --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # # first, look for the shell script config file # if not found, punt # source env. for dsmlgw [ -f @dsmlgwconfigdir@/dsmlgw.env ] && . @dsmlgwconfigdir@/dsmlgw.env # if root, use su to execute the startup script - user is set in @initconfigdir@/@package_name@ myuid=`id | cut -f1 -d' '` if [ "$myuid" = 'uid=0(root)' ] ; then su $TOMCAT_USER -c "@tomcat_cmd@ $@" else @tomcat_cmd@ $@ fi --- NEW FILE stop-ds-dsmlgw.in --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # # source env. for dsmlgw [ -f @dsmlgwconfigdir@/dsmlgw.env ] && . @dsmlgwconfigdir@/dsmlgw.env kill `cat $CATALINA_PID`

1 0

[Fedora-directory-commits] dsmlgw build.fhs.properties, 1.1, 1.2 build.fhsopt.properties, 1.1, 1.2 build.prefix.properties, 1.1, 1.2 build.xml, 1.6, 1.7
by Doctor Conrad 24 Apr '08

24 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18285/dsmlgw Modified Files: build.fhs.properties build.fhsopt.properties build.prefix.properties build.xml Log Message: move scripts to new scripts directory - add very simple dsmlgw-search script to test dsmlgw - remove some error messages Index: build.fhs.properties =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.fhs.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.fhs.properties 23 Apr 2008 16:55:58 -0000 1.1 +++ build.fhs.properties 24 Apr 2008 21:39:10 -0000 1.2 @@ -4,3 +4,4 @@ dsmlgwlogdir=/var/log/${project.name.base}/${ant.project.name} dsmlgwrundir=/var/run/${project.name.base}/${ant.project.name} dsmlgwsbindir=${prefix}/sbin +dsmlgwbindir=${prefix}/bin Index: build.fhsopt.properties =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.fhsopt.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.fhsopt.properties 23 Apr 2008 16:55:58 -0000 1.1 +++ build.fhsopt.properties 24 Apr 2008 21:39:10 -0000 1.2 @@ -3,3 +3,4 @@ dsmlgwlogdir=/var${prefix}/${ant.project.name}/log dsmlgwrundir=/var${prefix}/${ant.project.name}/run dsmlgwsbindir=${prefix}/sbin +dsmlgwbindir=${prefix}/bin Index: build.prefix.properties =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.prefix.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.prefix.properties 23 Apr 2008 16:55:58 -0000 1.1 +++ build.prefix.properties 24 Apr 2008 21:39:10 -0000 1.2 @@ -3,3 +3,4 @@ dsmlgwlogdir=${prefix}/log/${ant.project.name} dsmlgwrundir=${prefix}/run/${ant.project.name} dsmlgwsbindir=${prefix}/sbin +dsmlgwbindir=${prefix}/bin Index: build.xml =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- build.xml 24 Apr 2008 14:54:25 -0000 1.6 +++ build.xml 24 Apr 2008 21:39:10 -0000 1.7 @@ -201,21 +201,24 @@ <mkdir dir="${pkg.dir}${dsmlgwrundir}"/> <mkdir dir="${pkg.dir}${dsmlgwsbindir}"/> <unjar src="${dist.dir}/dsmlgw.war" dest="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/> - <copyfilter file="misc/setup-ds-dsmlgw.in" + <copyfilter file="scripts/setup-ds-dsmlgw.in" tofile="${pkg.dir}${dsmlgwsbindir}/setup-ds-dsmlgw"/> <chmod file="${pkg.dir}${dsmlgwsbindir}/setup-ds-dsmlgw" perm="0755"/> - <copyfilter file="misc/start-ds-dsmlgw.in" + <copyfilter file="scripts/start-ds-dsmlgw.in" tofile="${pkg.dir}${dsmlgwsbindir}/start-ds-dsmlgw"/> <chmod file="${pkg.dir}${dsmlgwsbindir}/start-ds-dsmlgw" perm="0755"/> - <copyfilter file="misc/stop-ds-dsmlgw.in" + <copyfilter file="scripts/stop-ds-dsmlgw.in" tofile="${pkg.dir}${dsmlgwsbindir}/stop-ds-dsmlgw"/> <chmod file="${pkg.dir}${dsmlgwsbindir}/stop-ds-dsmlgw" perm="0755"/> - <copyfilter file="misc/restart-ds-dsmlgw.in" + <copyfilter file="scripts/restart-ds-dsmlgw.in" tofile="${pkg.dir}${dsmlgwsbindir}/restart-ds-dsmlgw"/> <chmod file="${pkg.dir}${dsmlgwsbindir}/restart-ds-dsmlgw" perm="0755"/> - <copyfilter file="misc/dsmlgw.env.in" + <copyfilter file="scripts/dsmlgw.env.in" tofile="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.env"/> <chmod file="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.env" perm="0644"/> + <copyfilter file="scripts/dsmlgw-search.in" + tofile="${pkg.dir}${dsmlgwbindir}/dsmlgw-search"/> + <chmod file="${pkg.dir}${dsmlgwbindir}/dsmlgw-search" perm="0755"/> <copy file="misc/dsmlgw.cfg" todir="${pkg.dir}${dsmlgwconfigdir}"/> <chmod file="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.cfg" perm="0644"/> <tar destfile="${dist.dir}/${ant.project.name}-${version}.tar"

1 0

[Fedora-directory-commits] dsmlgw/scripts - New directory
by Doctor Conrad 24 Apr '08

24 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26306/scripts Log Message: Directory /cvs/dirsec/dsmlgw/scripts added to the repository

1 0

[Fedora-directory-commits] dsmlgw build.xml,1.5,1.6
by Doctor Conrad 24 Apr '08

24 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19593 Modified Files: build.xml Log Message: added server-config.wsdd.in Index: build.xml =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- build.xml 23 Apr 2008 21:38:02 -0000 1.5 +++ build.xml 24 Apr 2008 14:54:25 -0000 1.6 @@ -86,6 +86,26 @@ <available file="${axisdist.dir}" type="dir" property="havelocalaxisbin"/> +  + <presetdef name="copyfilter"> + <copy file="${src.file}" tofile="${dest.file}"> + <filterchain> + <replacetokens> + <token key="package_name" value="${ant.project.name}"/> + <token key="runtime_javahome" value="${runtime.java.home}"/> + <token key="tomcat_home" value="${tomcat.home}"/> + <token key="tomcat_cmd" value="${tomcat.cmd}"/> + <token key="dsmlgwdatadir" value="${dsmlgwdatadir}"/> + <token key="dsmlgwconfigdir" value="${dsmlgwconfigdir}"/> + <token key="dsmlgwlogdir" value="${dsmlgwlogdir}"/> + <token key="dsmlgwrundir" value="${dsmlgwrundir}"/> + <token key="dsmlgwsbindir" value="${dsmlgwsbindir}"/> + <token key="dsmlgwuser" value="${dsmlgwuser}"/> + </replacetokens> + </filterchain> + </copy> + </presetdef> + <target name="help" description="get help"> <echo> There are 6 jar files required to build ${ant.project.name}, specified @@ -157,7 +177,8 @@ <copy file="${mail.jar}" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/>  <copy file="misc/dsmlgw.cfg" todir="${dist.dir}/webapps/axis/WEB-INF/classes"/> - <copy file="misc/dsmlgw-deploy.wsdd" todir="${dist.dir}/webapps/axis/WEB-INF/classes"/> + <copyfilter file="misc/server-config.wsdd.in" + tofile="${dist.dir}/webapps/axis/WEB-INF/server-config.wsdd"/> <copy file="misc/logging.properties" todir="${dist.dir}/webapps/axis/WEB-INF/classes"/> <copy file="misc/log4j.properties" todir="${dist.dir}/webapps/axis/WEB-INF/classes"/> </target> @@ -173,26 +194,6 @@ </war> </target> -  - <presetdef name="copyfilter"> - <copy file="${src.file}" tofile="${dest.file}"> - <filterchain> - <replacetokens> - <token key="package_name" value="${ant.project.name}"/> - <token key="runtime_javahome" value="${runtime.java.home}"/> - <token key="tomcat_home" value="${tomcat.home}"/> - <token key="tomcat_cmd" value="${tomcat.cmd}"/> - <token key="dsmlgwdatadir" value="${dsmlgwdatadir}"/> - <token key="dsmlgwconfigdir" value="${dsmlgwconfigdir}"/> - <token key="dsmlgwlogdir" value="${dsmlgwlogdir}"/> - <token key="dsmlgwrundir" value="${dsmlgwrundir}"/> - <token key="dsmlgwsbindir" value="${dsmlgwsbindir}"/> - <token key="dsmlgwuser" value="${dsmlgwuser}"/> - </replacetokens> - </filterchain> - </copy> - </presetdef> - <target name="makepkg" description="create the distribution package" depends="makewar"> <mkdir dir="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/> <mkdir dir="${pkg.dir}${dsmlgwconfigdir}"/>

1 0

[Fedora-directory-commits] dsmlgw/misc web-app_2_3.dtd, 1.1.1.1, NONE server-config.wsdd, 1.2, NONE
by Doctor Conrad 23 Apr '08

23 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/misc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25736 Removed Files: web-app_2_3.dtd server-config.wsdd Log Message: unused files --- web-app_2_3.dtd DELETED --- --- server-config.wsdd DELETED ---

1 0

[Fedora-directory-commits] dsmlgw/misc server-config.wsdd.in, NONE, 1.1
by Doctor Conrad 23 Apr '08

23 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/misc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25681 Added Files: server-config.wsdd.in Log Message: added default server-config.wsdd --- NEW FILE server-config.wsdd.in --- <?xml version="1.0" encoding="UTF-8"?> <deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"> <globalConfiguration> <parameter name="sendMultiRefs" value="true"/> <parameter name="disablePrettyXML" value="true"/> <parameter name="adminPassword" value="admin"/> <parameter name="attachments.Directory" value="@dsmlgwrundir@/attachments"/> <parameter name="dotNetSoapEncFix" value="true"/> <parameter name="enableNamespacePrefixOptimization" value="false"/> <parameter name="sendXMLDeclaration" value="true"/> <parameter name="sendXsiTypes" value="true"/> <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/> <requestFlow> <handler type="java:org.apache.axis.handlers.JWSHandler"> <parameter name="scope" value="session"/> </handler> <handler type="java:org.apache.axis.handlers.JWSHandler"> <parameter name="scope" value="request"/> <parameter name="extension" value=".jwr"/> </handler> </requestFlow> </globalConfiguration> <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/> <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/> <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/> <service name="AdminService" provider="java:MSG"> <parameter name="allowedMethods" value="AdminService"/> <parameter name="enableRemoteAdmin" value="false"/> <parameter name="className" value="org.apache.axis.utils.Admin"/> <namespace>http://xml.apache.org/axis/wsdd/</namespace> </service> <service name="Version" provider="java:RPC"> <parameter name="allowedMethods" value="getVersion"/> <parameter name="className" value="org.apache.axis.Version"/> </service> <service name="dsmlgw" provider="Handler"> <parameter name="handlerClass" value="com.netscape.dsml.gateway.gatewayHandler"/> </service> <transport name="http"> <requestFlow> <handler type="URLMapper"/> <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/> </requestFlow> <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/> <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/> <parameter name="qs.list" value="org.apache.axis.transport.http.QSListHandler"/> <parameter name="qs.method" value="org.apache.axis.transport.http.QSMethodHandler"/> <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/> <parameter name="qs.wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/> </transport> <transport name="local"> <responseFlow> <handler type="LocalResponder"/> </responseFlow> </transport> </deployment>

1 0

[Fedora-directory-commits] dsmlgw build.xml,1.4,1.5
by Doctor Conrad 23 Apr '08

23 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13196/dsmlgw Modified Files: build.xml Log Message: added restart and stop commands - clean up setup, start, and build.xml Index: build.xml =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- build.xml 23 Apr 2008 16:55:58 -0000 1.4 +++ build.xml 23 Apr 2008 21:38:02 -0000 1.5 @@ -151,9 +151,7 @@ <target name="pkgwebapp" description="create the webapps layout, prepare for WAR" depends="dist,useaxisbinpkg,copywebappsdir">  <copy file="${dist.dir}/dsmlgw.jar" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/> -  <copy file="${codec.jar}" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/> <copy file="${activation.jar}" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/> <copy file="${mail.jar}" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/> @@ -174,47 +172,10 @@ </fileset> </war> </target> - - <target name="makepkg" description="create the distribution package" depends="makewar"> - <mkdir dir="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/> - <mkdir dir="${pkg.dir}${dsmlgwconfigdir}"/> - <mkdir dir="${pkg.dir}${dsmlgwlogdir}"/> - <mkdir dir="${pkg.dir}${dsmlgwrundir}"/> - <mkdir dir="${pkg.dir}${dsmlgwsbindir}"/> - <unjar src="${dist.dir}/dsmlgw.war" dest="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/> - <copy file="misc/setup-ds-dsmlgw.in" tofile="${pkg.dir}${dsmlgwsbindir}/setup-ds-dsmlgw"> - <filterchain> - <replacetokens> - <token key="package_name" value="${ant.project.name}"/> - <token key="runtime_javahome" value="${runtime.java.home}"/> - <token key="tomcat_home" value="${tomcat.home}"/> - <token key="tomcat_cmd" value="${tomcat.cmd}"/> - <token key="dsmlgwdatadir" value="${dsmlgwdatadir}"/> - <token key="dsmlgwconfigdir" value="${dsmlgwconfigdir}"/> - <token key="dsmlgwlogdir" value="${dsmlgwlogdir}"/> - <token key="dsmlgwrundir" value="${dsmlgwrundir}"/> - <token key="dsmlgwsbindir" value="${dsmlgwsbindir}"/> - <token key="dsmlgwuser" value="${dsmlgwuser}"/> - </replacetokens> - </filterchain> - </copy> - <copy file="misc/start-ds-dsmlgw.in" tofile="${pkg.dir}${dsmlgwsbindir}/start-ds-dsmlgw"> - <filterchain> - <replacetokens> - <token key="package_name" value="${ant.project.name}"/> - <token key="runtime_javahome" value="${runtime.java.home}"/> - <token key="tomcat_home" value="${tomcat.home}"/> - <token key="tomcat_cmd" value="${tomcat.cmd}"/> - <token key="dsmlgwdatadir" value="${dsmlgwdatadir}"/> - <token key="dsmlgwconfigdir" value="${dsmlgwconfigdir}"/> - <token key="dsmlgwlogdir" value="${dsmlgwlogdir}"/> - <token key="dsmlgwrundir" value="${dsmlgwrundir}"/> - <token key="dsmlgwsbindir" value="${dsmlgwsbindir}"/> - <token key="dsmlgwuser" value="${dsmlgwuser}"/> - </replacetokens> - </filterchain> - </copy> - <copy file="misc/dsmlgw.env.in" tofile="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.env"> + +  + <presetdef name="copyfilter"> + <copy file="${src.file}" tofile="${dest.file}"> <filterchain> <replacetokens> <token key="package_name" value="${ant.project.name}"/> @@ -230,7 +191,32 @@ </replacetokens> </filterchain> </copy> + </presetdef> + + <target name="makepkg" description="create the distribution package" depends="makewar"> + <mkdir dir="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/> + <mkdir dir="${pkg.dir}${dsmlgwconfigdir}"/> + <mkdir dir="${pkg.dir}${dsmlgwlogdir}"/> + <mkdir dir="${pkg.dir}${dsmlgwrundir}"/> + <mkdir dir="${pkg.dir}${dsmlgwsbindir}"/> + <unjar src="${dist.dir}/dsmlgw.war" dest="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/> + <copyfilter file="misc/setup-ds-dsmlgw.in" + tofile="${pkg.dir}${dsmlgwsbindir}/setup-ds-dsmlgw"/> + <chmod file="${pkg.dir}${dsmlgwsbindir}/setup-ds-dsmlgw" perm="0755"/> + <copyfilter file="misc/start-ds-dsmlgw.in" + tofile="${pkg.dir}${dsmlgwsbindir}/start-ds-dsmlgw"/> + <chmod file="${pkg.dir}${dsmlgwsbindir}/start-ds-dsmlgw" perm="0755"/> + <copyfilter file="misc/stop-ds-dsmlgw.in" + tofile="${pkg.dir}${dsmlgwsbindir}/stop-ds-dsmlgw"/> + <chmod file="${pkg.dir}${dsmlgwsbindir}/stop-ds-dsmlgw" perm="0755"/> + <copyfilter file="misc/restart-ds-dsmlgw.in" + tofile="${pkg.dir}${dsmlgwsbindir}/restart-ds-dsmlgw"/> + <chmod file="${pkg.dir}${dsmlgwsbindir}/restart-ds-dsmlgw" perm="0755"/> + <copyfilter file="misc/dsmlgw.env.in" + tofile="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.env"/> + <chmod file="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.env" perm="0644"/> <copy file="misc/dsmlgw.cfg" todir="${pkg.dir}${dsmlgwconfigdir}"/> + <chmod file="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.cfg" perm="0644"/> <tar destfile="${dist.dir}/${ant.project.name}-${version}.tar" basedir="${pkg.dir}"/> <gzip zipfile="${dist.dir}/${ant.project.name}-${version}.tar.gz"

1 0

[Fedora-directory-commits] dsmlgw/misc restart-ds-dsmlgw.in, NONE, 1.1 stop-ds-dsmlgw.in, NONE, 1.1 setup-ds-dsmlgw.in, 1.2, 1.3 start-ds-dsmlgw.in, 1.3, 1.4
by Doctor Conrad 23 Apr '08

23 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/misc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13196/dsmlgw/misc Modified Files: setup-ds-dsmlgw.in start-ds-dsmlgw.in Added Files: restart-ds-dsmlgw.in stop-ds-dsmlgw.in Log Message: added restart and stop commands - clean up setup, start, and build.xml --- NEW FILE restart-ds-dsmlgw.in --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # @dsmlgwsbindir@/stop-ds-dsmlgw @dsmlgwsbindir@/start-ds-dsmlgw --- NEW FILE stop-ds-dsmlgw.in --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # # source env. for dsmlgw [ -f @dsmlgwconfigdir@/dsmlgw.env ] && . @dsmlgwconfigdir@/dsmlgw.env kill `cat $CATALINA_PID` Index: setup-ds-dsmlgw.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/misc/setup-ds-dsmlgw.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- setup-ds-dsmlgw.in 23 Apr 2008 18:28:26 -0000 1.2 +++ setup-ds-dsmlgw.in 23 Apr 2008 21:38:03 -0000 1.3 @@ -169,6 +169,12 @@ fi done +# tomcat needs the webapps/ROOT directory too +if [ -d $dsmlgwdir/webapps/ROOT ] ; then + echo $dsmlgwdir/webapps/ROOT exists, skipping . . . +else + ln -s $tomcat_home/webapps/ROOT $dsmlgwdir/webapps/ROOT +fi if [ -f "$inffile" ] ; then hostname=`getValFromInf FullMachineName $inffile` @@ -200,7 +206,7 @@ echo file $dsmlgwconfigdir/dsmlgw.cfg echo exists already. If you want to force a reconfiguration, removing echo your existing configuration and recreating it, run this script - echo again with the "-r" argument. + echo again with the \"-r\" argument. exit 1 fi Index: start-ds-dsmlgw.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/misc/start-ds-dsmlgw.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- start-ds-dsmlgw.in 23 Apr 2008 18:29:21 -0000 1.3 +++ start-ds-dsmlgw.in 23 Apr 2008 21:38:03 -0000 1.4 @@ -25,7 +25,8 @@ [ -f @dsmlgwconfigdir@/dsmlgw.env ] && . @dsmlgwconfigdir@/dsmlgw.env # if root, use su to execute the startup script - user is set in @initconfigdir@/@package_name@ -if [ "$USER" = "root" ] ; then +myuid=`id | cut -f1 -d' '` +if [ "$myuid" = 'uid=0(root)' ] ; then su $TOMCAT_USER -c "@tomcat_cmd@ $@" else @tomcat_cmd@ $@

1 0

[Fedora-directory-commits] dsmlgw/misc start-ds-dsmlgw.in,1.2,1.3
by Doctor Conrad 23 Apr '08

23 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/misc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21090 Modified Files: start-ds-dsmlgw.in Log Message: TOMCAT_USER not CATALINA_USER Index: start-ds-dsmlgw.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/misc/start-ds-dsmlgw.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- start-ds-dsmlgw.in 23 Apr 2008 18:28:53 -0000 1.2 +++ start-ds-dsmlgw.in 23 Apr 2008 18:29:21 -0000 1.3 @@ -26,7 +26,7 @@ # if root, use su to execute the startup script - user is set in @initconfigdir@/@package_name@ if [ "$USER" = "root" ] ; then - su $CATALINA_USER -c "@tomcat_cmd@ $@" + su $TOMCAT_USER -c "@tomcat_cmd@ $@" else @tomcat_cmd@ $@ fi

1 0

[Fedora-directory-commits] dsmlgw/misc start-ds-dsmlgw.in,1.1,1.2
by Doctor Conrad 23 Apr '08

23 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/misc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21063 Modified Files: start-ds-dsmlgw.in Log Message: use su instead of su - Index: start-ds-dsmlgw.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/misc/start-ds-dsmlgw.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- start-ds-dsmlgw.in 23 Apr 2008 16:55:58 -0000 1.1 +++ start-ds-dsmlgw.in 23 Apr 2008 18:28:53 -0000 1.2 @@ -26,7 +26,7 @@ # if root, use su to execute the startup script - user is set in @initconfigdir@/@package_name@ if [ "$USER" = "root" ] ; then - su - $CATALINA_USER -c "@tomcat_cmd@ $@" + su $CATALINA_USER -c "@tomcat_cmd@ $@" else @tomcat_cmd@ $@ fi

1 0

[Fedora-directory-commits] dsmlgw/misc setup-ds-dsmlgw.in,1.1,1.2
by Doctor Conrad 23 Apr '08

23 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/misc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21023 Modified Files: setup-ds-dsmlgw.in Log Message: update dsmlgw.cfg and dsmlgw.env with correct information Index: setup-ds-dsmlgw.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/misc/setup-ds-dsmlgw.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- setup-ds-dsmlgw.in 23 Apr 2008 16:55:58 -0000 1.1 +++ setup-ds-dsmlgw.in 23 Apr 2008 18:28:26 -0000 1.2 @@ -55,30 +55,22 @@ # e.g. /etc/dirsrv/dsmlgw dsmlgwconfigdir="@dsmlgwconfigdir@" +dsmlgwlogdir="@dsmlgwlogdir@" +dsmlgwrundir="@dsmlgwrundir@" basecfgdir=`dirname $dsmlgwconfigdir` -# default security dir -securitydir="@securitydir@" -defaultsecdir=1 +securitydir="@dsmlgwconfigdir@" # see if there is a $dsmlgwconfigdir/../admin-serv admservdir=$basecfgdir/admin-serv if [ -f "$admservdir/local.conf" ] ; then echo Reading parameters from Administration Server config . . . host=`getValFromLdif serverHostName "$admservdir/local.conf"` - port=`getValFromLdif configuration.nsServerPort "$admservdir/local.conf"` sec=`getValFromLdif configuration.nsServerSecurity "$admservdir/local.conf"` - if [ "$sec" = "on" ] ; then - httpurl="https://$host:$port" - if [ -n "$defaultsecdir" ] ; then - securitydir="$admservdir" - defaultsecdir= - fi - else - httpurl="http://$host:$port" + if [ "$sec" = "on" -a ! -f $securitydir/cert8.db ] ; then + cp $admservdir/cert8.db $securitydir fi dsmlgwuser=`ls -l $admservdir/local.conf | awk '{print $3}'` dsmlgwgroup=`ls -l $admservdir/local.conf | awk '{print $4}'` - echo Using Administration Server URL $httpurl . . . else echo echo '########################################################################' @@ -102,20 +94,13 @@ if [ "$sec" = "on" ] ; then port=`getValFromLdif nsslapd-secureport "$dir/dse.ldif"` ldapurl="ldaps://$host:$port" - if [ -n "$defaultsecdir" ] ; then - securitydir="$dir" - defaultsecdir= + if [ ! -f $securitydir/cert8.db ] ; then + cp $dir/cert8.db $securitydir fi else port=`getValFromLdif nsslapd-port "$dir/dse.ldif"` ldapurl="ldap://$host:$port" fi - # get suffix - first non-netscaperoot suffix - savesuffix="$suffix" - suffix=`grep ^nsslapd-suffix: $dir/dse.ldif | sed -e 's/^nsslapd-suffix:[ ]*//' | grep -v -i o=netscaperoot | head -1` - if [ -z "$suffix" ] ; then - suffix="$savesuffix" - fi if [ -z "$dsmlgwuser" ] ; then dsmlgwuser=`ls -l $dir/dse.ldif | awk '{print $3}'` fi @@ -126,7 +111,7 @@ done if [ -n "$ldapurl" ] ; then - echo Using Directory Server URL $ldapurl/$suffix . . . + echo Using Directory Server URL $ldapurl fi # get command line arguments @@ -188,10 +173,7 @@ if [ -f "$inffile" ] ; then hostname=`getValFromInf FullMachineName $inffile` port=`getValFromInf ServerPort $inffile` - suffix=`getValFromInf Suffix $inffile` dirmgr=`getValFromInf RootDN $inffile` - httpport=`getValFromInf Port $inffile` - httpurl="http://$host:$httpport" ldapurl="ldap://$host:$port" infuser=`getValFromInf SysUser $inffile` infgroup=`getValFromInf SysGroup $inffile` @@ -208,8 +190,7 @@ dsmlgwgroup="$infgroup" fi echo Using parameters from file $inffile . . . - echo Using Administration Server URL $httpurl . . . - echo Using Directory Server URL $ldapurl/$suffix . . . + echo Using Directory Server URL $ldapurl . . . fi if [ -z "$reconfig" -a -f $dsmlgwconfigdir/dsmlgw.cfg ] ; then @@ -225,19 +206,21 @@ echo Generating config file $dsmlgwconfigdir/dsmlgw.cfg . . . # generate dsmlgw.cfg in the $dsmlgwconfigdir directory -rm -f $dsmlgwconfigdir/dsmlgw.conf -sed -e "s#@host@#$hostname#g" \ - -e "s#@port@#$port#g" \ - -e "s#@httpport@#$httpport#g" \ - -e "s#@suffix@#$suffix#g" \ - -e "s#@dirmgr@#$dirmgr#g" \ - -e "s#^securitypath.*\$#securitypath $securitydir#g" \ - -e "s#@ldapurl@#$ldapurl#g" \ - -e "s#@httpurl@#$httpurl#g" \ - @configdir@/dsmlgw.tmpl > $dsmlgwconfigdir/dsmlgw.conf +rm -f $dsmlgwconfigdir/dsmlgw.cfg +echo ServerHost=$host > $dsmlgwconfigdir/dsmlgw.cfg +echo ServerPort=$port >> $dsmlgwconfigdir/dsmlgw.cfg +echo BindDN=$rootdn >> $dsmlgwconfigdir/dsmlgw.cfg +echo BindPW= >> $dsmlgwconfigdir/dsmlgw.cfg + +echo Updating the user information in $dsmlgwconfigdir/dsmlgw.env . . . +cp $dsmlgwconfigdir/dsmlgw.env $dsmlgwconfigdir/dsmlgw.env.orig +sed -e "s/TOMCAT_USER=.*/TOMCAT_USER=$dsmlgwuser/" $dsmlgwconfigdir/dsmlgw.env.orig > $dsmlgwconfigdir/dsmlgw.env + +chown -R $dsmlgwuser:$dsmlgwgroup $dsmlgwconfigdir +chown -R $dsmlgwuser:$dsmlgwgroup $dsmlgwlogdir +chown -R $dsmlgwuser:$dsmlgwgroup $dsmlgwrundir -chown $dsmlgwuser:$dsmlgwgroup $dsmlgwconfigdir/dsmlgw.conf -chmod 0400 $dsmlgwconfigdir/dsmlgw.conf +chmod 0400 $dsmlgwconfigdir/dsmlgw.cfg echo echo The DSML Gateway has been successfully configured.

1 0

[Fedora-directory-commits] dsmlgw build.fhs.properties, NONE, 1.1 build.fhsopt.properties, NONE, 1.1 build.prefix.properties, NONE, 1.1 build.properties, 1.1, 1.2 build.xml, 1.3, 1.4
by Doctor Conrad 23 Apr '08

23 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3561/dsmlgw Modified Files: build.properties build.xml Added Files: build.fhs.properties build.fhsopt.properties build.prefix.properties Log Message: initial commit for packaging - allow fhs, fhsopt, and straight prefix packaging - added setup and start scripts --- NEW FILE build.fhs.properties --- prefix=/usr dsmlgwdatadir=${prefix}/share/${project.name.base}/${ant.project.name} dsmlgwconfigdir=/etc/${project.name.base}/${ant.project.name} dsmlgwlogdir=/var/log/${project.name.base}/${ant.project.name} dsmlgwrundir=/var/run/${project.name.base}/${ant.project.name} dsmlgwsbindir=${prefix}/sbin --- NEW FILE build.fhsopt.properties --- dsmlgwdatadir=${prefix}/share/${ant.project.name} dsmlgwconfigdir=/etc${prefix}/${ant.project.name} dsmlgwlogdir=/var${prefix}/${ant.project.name}/log dsmlgwrundir=/var${prefix}/${ant.project.name}/run dsmlgwsbindir=${prefix}/sbin --- NEW FILE build.prefix.properties --- dsmlgwdatadir=${prefix}/share/${ant.project.name} dsmlgwconfigdir=${prefix}/etc/${ant.project.name} dsmlgwlogdir=${prefix}/log/${ant.project.name} dsmlgwrundir=${prefix}/run/${ant.project.name} dsmlgwsbindir=${prefix}/sbin Index: build.properties =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.properties 18 Apr 2008 16:43:38 -0000 1.1 +++ build.properties 23 Apr 2008 16:55:58 -0000 1.2 @@ -1,3 +1,11 @@ +project.name.base=dirsrv +version=1.1.0 +# default prefix to use for packaging +prefix=/opt/${project.name.base} +# default user id for tomcat - override to "daemon" on hpux -Ddsmlgwuser=daemon +dsmlgwuser=nobody +runtime.java.home=${java.home} + axisbin.url=http://apache.mirrors.tds.net/ws/axis/1_4/ #axisbin.dir=/path/to/ axisbin.tgz=axis-bin-1_4.tar.gz Index: build.xml =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 21 Apr 2008 17:58:54 -0000 1.3 +++ build.xml 23 Apr 2008 16:55:58 -0000 1.4 @@ -20,6 +20,19 @@ <property file="build.properties" /> <property file="${user.home}/build.properties" /> +  + <property name="pkg.type" value="prefix"/> +  + <property file="build.${pkg.type}.properties" /> +  + <property name="tomcat.cmd" value="${tomcat.home}/bin/startup.sh"/>  <property name="globaldist.dir" location="/usr/share/java" /> @@ -31,7 +44,7 @@ on the command line - otherwise, it will default to using /usr/share/java and /usr/share/java/axis --> - <property name="axisdist.dir" location="/usr/share/java/axis" /> + <property name="axisdist.dir" location="/usr/share/java/axis" /> <property name="axis.lib.dir" location="/usr/share/java/axis" />  <property name="dist.dir" value="${mcom.root}/../dist/dsmlgw" /> + <property name="pkg.dir" value="${dist.dir}/pkg"/>  <available file="${axisdist.dir}/webapps/axis" type="dir" @@ -160,6 +174,69 @@ </fileset> </war> </target> + + <target name="makepkg" description="create the distribution package" depends="makewar"> + <mkdir dir="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/> + <mkdir dir="${pkg.dir}${dsmlgwconfigdir}"/> + <mkdir dir="${pkg.dir}${dsmlgwlogdir}"/> + <mkdir dir="${pkg.dir}${dsmlgwrundir}"/> + <mkdir dir="${pkg.dir}${dsmlgwsbindir}"/> + <unjar src="${dist.dir}/dsmlgw.war" dest="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/> + <copy file="misc/setup-ds-dsmlgw.in" tofile="${pkg.dir}${dsmlgwsbindir}/setup-ds-dsmlgw"> + <filterchain> + <replacetokens> + <token key="package_name" value="${ant.project.name}"/> + <token key="runtime_javahome" value="${runtime.java.home}"/> + <token key="tomcat_home" value="${tomcat.home}"/> + <token key="tomcat_cmd" value="${tomcat.cmd}"/> + <token key="dsmlgwdatadir" value="${dsmlgwdatadir}"/> + <token key="dsmlgwconfigdir" value="${dsmlgwconfigdir}"/> + <token key="dsmlgwlogdir" value="${dsmlgwlogdir}"/> + <token key="dsmlgwrundir" value="${dsmlgwrundir}"/> + <token key="dsmlgwsbindir" value="${dsmlgwsbindir}"/> + <token key="dsmlgwuser" value="${dsmlgwuser}"/> + </replacetokens> + </filterchain> + </copy> + <copy file="misc/start-ds-dsmlgw.in" tofile="${pkg.dir}${dsmlgwsbindir}/start-ds-dsmlgw"> + <filterchain> + <replacetokens> + <token key="package_name" value="${ant.project.name}"/> + <token key="runtime_javahome" value="${runtime.java.home}"/> + <token key="tomcat_home" value="${tomcat.home}"/> + <token key="tomcat_cmd" value="${tomcat.cmd}"/> + <token key="dsmlgwdatadir" value="${dsmlgwdatadir}"/> + <token key="dsmlgwconfigdir" value="${dsmlgwconfigdir}"/> + <token key="dsmlgwlogdir" value="${dsmlgwlogdir}"/> + <token key="dsmlgwrundir" value="${dsmlgwrundir}"/> + <token key="dsmlgwsbindir" value="${dsmlgwsbindir}"/> + <token key="dsmlgwuser" value="${dsmlgwuser}"/> + </replacetokens> + </filterchain> + </copy> + <copy file="misc/dsmlgw.env.in" tofile="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.env"> + <filterchain> + <replacetokens> + <token key="package_name" value="${ant.project.name}"/> + <token key="runtime_javahome" value="${runtime.java.home}"/> + <token key="tomcat_home" value="${tomcat.home}"/> + <token key="tomcat_cmd" value="${tomcat.cmd}"/> + <token key="dsmlgwdatadir" value="${dsmlgwdatadir}"/> + <token key="dsmlgwconfigdir" value="${dsmlgwconfigdir}"/> + <token key="dsmlgwlogdir" value="${dsmlgwlogdir}"/> + <token key="dsmlgwrundir" value="${dsmlgwrundir}"/> + <token key="dsmlgwsbindir" value="${dsmlgwsbindir}"/> + <token key="dsmlgwuser" value="${dsmlgwuser}"/> + </replacetokens> + </filterchain> + </copy> + <copy file="misc/dsmlgw.cfg" todir="${pkg.dir}${dsmlgwconfigdir}"/> + <tar destfile="${dist.dir}/${ant.project.name}-${version}.tar" + basedir="${pkg.dir}"/> + <gzip zipfile="${dist.dir}/${ant.project.name}-${version}.tar.gz" + src="${dist.dir}/${ant.project.name}-${version}.tar"/> + <delete file="${dist.dir}/${ant.project.name}-${version}.tar"/> + </target> <target name="prepare" description="prepares the output directories"> <mkdir dir="${build.dir}" />

1 0

[Fedora-directory-commits] dsmlgw/misc dsmlgw.env.in, NONE, 1.1 setup-ds-dsmlgw.in, NONE, 1.1 start-ds-dsmlgw.in, NONE, 1.1
by Doctor Conrad 23 Apr '08

23 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/misc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3561/dsmlgw/misc Added Files: dsmlgw.env.in setup-ds-dsmlgw.in start-ds-dsmlgw.in Log Message: initial commit for packaging - allow fhs, fhsopt, and straight prefix packaging - added setup and start scripts --- NEW FILE dsmlgw.env.in --- # This file sets up the environment which the dsmlgw will use if [ -z "$DSMLGW_CONFIG_DIR" ] ; then DSMLGW_CONFIG_DIR=@dsmlgwconfigdir@ export DSMLGW_CONFIG_DIR fi if [ -z "$CATALINA_HOME" ] ; then CATALINA_HOME=@dsmlgwdatadir@ export CATALINA_HOME fi if [ -z "$CATALINA_PID" ] ; then CATALINA_PID=@dsmlgwrundir@/@package_name@.pid export CATALINA_PID fi if [ -z "$TOMCAT_USER" ] ; then TOMCAT_USER=@dsmlgwuser@ export TOMCAT_USER fi if [ -z "$CATALINA_TEMP" ] ; then CATALINA_TEMP=@dsmlgwrundir@/temp export CATALINA_TEMP fi if [ -z "$JAVA_HOME" ] ; then JAVA_HOME=@runtime_javahome@ export JAVA_HOME PATH=$JAVA_HOME/bin:$PATH export PATH fi --- NEW FILE setup-ds-dsmlgw.in --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # ########################### # # The general strategy is to create an "instance" of tomcat, so that we # can use our own logs directory, pid directory, etc. and can run as a # user of our choosing rather than the default tomcat user # ########################## echo '######################################################################' echo This shell script will configure the DSML Gateway Axis service, as echo a web application running under Tomcat. echo getValFromInf() { cattr=$1 cfile=$2 rval=`grep ^$cattr $cfile | head -1 | sed -e "s/^$cattr[ ]*=[ ]*//"` echo $rval } getValFromConf() { cattr=$1 cfile=$2 rval=`grep ^$cattr $cfile | head -1 | sed -e "s/^$cattr[ ]*//"` echo $rval } getValFromLdif() { cattr=$1 cfile=$2 num=${3:-1} rval=`grep -i ^$cattr: $cfile | head -$num | sed -e "s/^..*:[ ]*//"` echo $rval } # e.g. /etc/dirsrv/dsmlgw dsmlgwconfigdir="@dsmlgwconfigdir@" basecfgdir=`dirname $dsmlgwconfigdir` # default security dir securitydir="@securitydir@" defaultsecdir=1 # see if there is a $dsmlgwconfigdir/../admin-serv admservdir=$basecfgdir/admin-serv if [ -f "$admservdir/local.conf" ] ; then echo Reading parameters from Administration Server config . . . host=`getValFromLdif serverHostName "$admservdir/local.conf"` port=`getValFromLdif configuration.nsServerPort "$admservdir/local.conf"` sec=`getValFromLdif configuration.nsServerSecurity "$admservdir/local.conf"` if [ "$sec" = "on" ] ; then httpurl="https://$host:$port" if [ -n "$defaultsecdir" ] ; then securitydir="$admservdir" defaultsecdir= fi else httpurl="http://$host:$port" fi dsmlgwuser=`ls -l $admservdir/local.conf | awk '{print $3}'` dsmlgwgroup=`ls -l $admservdir/local.conf | awk '{print $4}'` echo Using Administration Server URL $httpurl . . . else echo echo '########################################################################' echo Error: It appears the Administration Server has not yet been configured. echo There are configuration files missing from $admservdir echo Please run setup-ds-admin.pl to create your Administration Server echo then run this script again. exit 1 fi # see if there are any directory servers here for dir in $basecfgdir/slapd-* ; do case "$dir" in *.deleted) continue ;; esac if [ -d "$dir" -a -f "$dir/dse.ldif" ] ; then echo Reading parameters from Directory Server $dir . . . dirmgr=`getValFromLdif nsslapd-rootdn "$dir/dse.ldif"` host=`getValFromLdif nsslapd-localhost "$dir/dse.ldif"` sec=`getValFromLdif nsslapd-security "$dir/dse.ldif"` if [ "$sec" = "on" ] ; then port=`getValFromLdif nsslapd-secureport "$dir/dse.ldif"` ldapurl="ldaps://$host:$port" if [ -n "$defaultsecdir" ] ; then securitydir="$dir" defaultsecdir= fi else port=`getValFromLdif nsslapd-port "$dir/dse.ldif"` ldapurl="ldap://$host:$port" fi # get suffix - first non-netscaperoot suffix savesuffix="$suffix" suffix=`grep ^nsslapd-suffix: $dir/dse.ldif | sed -e 's/^nsslapd-suffix:[ ]*//' | grep -v -i o=netscaperoot | head -1` if [ -z "$suffix" ] ; then suffix="$savesuffix" fi if [ -z "$dsmlgwuser" ] ; then dsmlgwuser=`ls -l $dir/dse.ldif | awk '{print $3}'` fi if [ -z "$dsmlgwgroup" ] ; then dsmlgwgroup=`ls -l $dir/dse.ldif | awk '{print $4}'` fi fi done if [ -n "$ldapurl" ] ; then echo Using Directory Server URL $ldapurl/$suffix . . . fi # get command line arguments inffile= nextisinffile= reconfig= for arg in "$@" ; do if [ "$arg" = "-r" ]; then reconfig=1 elif [ "$arg" = "-f" ]; then nextisinffile=1 elif [ $nextisinffile ]; then inffile="$arg" nextisinffile= fi done tomcat_home=@tomcat_home@ if [ -z "$tomcat_home" -o ! -d "$tomcat_home" ] ; then echo ERROR: tomcat_home is not set to the tomcat directory exit 1 fi # CATALINA_HOME points to @datadir@/dsmlgw # these are the directories we need in order to run an instance of tomcat # bin server common shared conf temp webapps logs work # these directories will just be symlinks to the actual tomcat dir - they # are mostly read-only: bin server common shared conf # webapps will be a real directory and will contain axis + dsmlgw # logs will point to the dirsrv/dsmlgw logs directory # temp and work will point to the run/dsmlgw directory dsmlgwdir=@dsmlgwdatadir@ for dir in bin server common shared conf ; do if [ -d $dsmlgwdir/$dir ] ; then echo $dsmlgwdir/$dir exists, skipping . . . else ln -s $tomcat_home/$dir $dsmlgwdir/$dir fi done if [ -d $dsmlgwdir/logs ] ; then echo $dsmlgwdir/logs exists, skipping . . . else ln -s @dsmlgwlogdir@ $dsmlgwdir/logs fi for dir in temp work ; do if [ -d $dsmlgwdir/$dir ] ; then echo $dsmlgwdir/$dir exists, skipping . . . else ln -s @dsmlgwrundir@ $dsmlgwdir/$dir fi done if [ -f "$inffile" ] ; then hostname=`getValFromInf FullMachineName $inffile` port=`getValFromInf ServerPort $inffile` suffix=`getValFromInf Suffix $inffile` dirmgr=`getValFromInf RootDN $inffile` httpport=`getValFromInf Port $inffile` httpurl="http://$host:$httpport" ldapurl="ldap://$host:$port" infuser=`getValFromInf SysUser $inffile` infgroup=`getValFromInf SysGroup $inffile` if [ -z "$infuser" ] ; then infuser=`getValFromInf SuiteSpotUserID $inffile` fi if [ -z "$infgroup" ] ; then infgroup=`getValFromInf SuiteSpotGroup $inffile` fi if [ -n "$infuser" ] ; then dsmlgwuser="$infuser" fi if [ -n "$infgroup" ] ; then dsmlgwgroup="$infgroup" fi echo Using parameters from file $inffile . . . echo Using Administration Server URL $httpurl . . . echo Using Directory Server URL $ldapurl/$suffix . . . fi if [ -z "$reconfig" -a -f $dsmlgwconfigdir/dsmlgw.cfg ] ; then echo echo '######################################################################' echo The DSML Gateway has already been configured. The echo file $dsmlgwconfigdir/dsmlgw.cfg echo exists already. If you want to force a reconfiguration, removing echo your existing configuration and recreating it, run this script echo again with the "-r" argument. exit 1 fi echo Generating config file $dsmlgwconfigdir/dsmlgw.cfg . . . # generate dsmlgw.cfg in the $dsmlgwconfigdir directory rm -f $dsmlgwconfigdir/dsmlgw.conf sed -e "s#@host@#$hostname#g" \ -e "s#@port@#$port#g" \ -e "s#@httpport@#$httpport#g" \ -e "s#@suffix@#$suffix#g" \ -e "s#@dirmgr@#$dirmgr#g" \ -e "s#^securitypath.*\$#securitypath $securitydir#g" \ -e "s#@ldapurl@#$ldapurl#g" \ -e "s#@httpurl@#$httpurl#g" \ @configdir@/dsmlgw.tmpl > $dsmlgwconfigdir/dsmlgw.conf chown $dsmlgwuser:$dsmlgwgroup $dsmlgwconfigdir/dsmlgw.conf chmod 0400 $dsmlgwconfigdir/dsmlgw.conf echo echo The DSML Gateway has been successfully configured. echo '######################################################################' exit 0 --- NEW FILE start-ds-dsmlgw.in --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # # first, look for the shell script config file # if not found, punt # source env. for dsmlgw [ -f @dsmlgwconfigdir@/dsmlgw.env ] && . @dsmlgwconfigdir@/dsmlgw.env # if root, use su to execute the startup script - user is set in @initconfigdir@/@package_name@ if [ "$USER" = "root" ] ; then su - $CATALINA_USER -c "@tomcat_cmd@ $@" else @tomcat_cmd@ $@ fi

1 0

[Fedora-directory-commits] dsmlgw build.xml,1.2,1.3
by Doctor Conrad 21 Apr '08

21 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27669 Modified Files: build.xml Log Message: add packaging and war tasks Index: build.xml =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- build.xml 18 Apr 2008 16:43:38 -0000 1.2 +++ build.xml 21 Apr 2008 17:58:54 -0000 1.3 @@ -19,6 +19,7 @@ <project name="dsmlgw" default="dist" basedir="."> <property file="build.properties" /> + <property file="${user.home}/build.properties" />  <property name="globaldist.dir" location="/usr/share/java" /> @@ -41,7 +42,7 @@ <property name="axis.jar" location="${axis.lib.dir}/axis.jar" /> <property name="ldapjdk.jar" location="${ldapdist.dir}/ldapjdk.jar" /> <property name="activation.jar" location="${globaldist.dir}/activation.jar" /> - <property name="codec.jar" location="${globaldist.dir}/jakarta-commons-codec.jar" /> + <property name="codec.jar" location="${globaldist.dir}/commons-codec.jar" />  <property name="dist.dir" value="${mcom.root}/../dist/dsmlgw" /> +  <available file="${axisdist.dir}/webapps/axis" type="dir" property="haveaxisbinpkg"/> @@ -94,7 +96,7 @@ </echo> </target> - <target name="unzipaxisbinlocal" description="unzip a local axis bin tgz" if="havelocalaxisbin"> + <target name="unzipaxisbinlocal" description="unzip a local axis bin tgz" unless="havelocalaxisbin"> <gunzip dest="${dist.dir}/${axisbin.tar}" src="${axisbin.dir}/${axisbin.tgz}" /> </target> @@ -105,7 +107,7 @@  - <target name="useaxisbinpkg" description="extract the webapps part of the binary axis tgz" if="haveaxisbinpkg" depends="unzipaxisbinlocal,unzipaxisbinremote"> + <target name="useaxisbinpkg" description="extract the webapps part of the binary axis tgz" unless="havelocalaxisbin" depends="unzipaxisbinlocal,unzipaxisbinremote"> <untar src="${dist.dir}/${axisbin.tar}" dest="${dist.dir}"> <patternset> <include name="${axisname}/webapps/axis/**" /> @@ -116,13 +118,47 @@ <delete file="${dist.dir}/${axisbin.tar}" /> </target> + <target name="copywebappsdir" description="copy webapps dir from axis bin dist" + if="havelocalaxisbin"> + <mkdir dir="${dist.dir}/webapps"/> + <copy todir="${dist.dir}/webapps"> + <fileset dir="${axisdist.dir}/webapps"> + <exclude name="**/samples/**"/> + </fileset> + </copy> + </target> + <target name="mkwebappsdirs" description="make the webapps directory layout" unless="haveaxisbinpkg"> <mkdir dir="${dist.dir}/webapps/axis/WEB-INF/lib" /> <mkdir dir="${dist.dir}/webapps/axis/WEB-INF/classes" /> </target> - <target name="pkgwebapp" description="create the webapps layout, prepare for WAR" depends="dist,useaxisbinpkg,mkwebappsdirs"> + <target name="pkgwebapp" description="create the webapps layout, prepare for WAR" depends="dist,useaxisbinpkg,copywebappsdir"> +  + <copy file="${dist.dir}/dsmlgw.jar" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/> +  + <copy file="${codec.jar}" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/> + <copy file="${activation.jar}" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/> + <copy file="${mail.jar}" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/> +  + <copy file="misc/dsmlgw.cfg" todir="${dist.dir}/webapps/axis/WEB-INF/classes"/> + <copy file="misc/dsmlgw-deploy.wsdd" todir="${dist.dir}/webapps/axis/WEB-INF/classes"/> + <copy file="misc/logging.properties" todir="${dist.dir}/webapps/axis/WEB-INF/classes"/> + <copy file="misc/log4j.properties" todir="${dist.dir}/webapps/axis/WEB-INF/classes"/> + </target> + + <target name="makewar" description="create the WAR file" depends="pkgwebapp"> + <war destfile="${dist.dir}/dsmlgw.war" webxml="${dist.dir}/webapps/axis/WEB-INF/web.xml"> + <lib dir="${dist.dir}/webapps/axis/WEB-INF/lib"/> + <classes dir="${dist.dir}/webapps/axis/WEB-INF/classes"/> + <fileset dir="${dist.dir}/webapps/axis"> + <exclude name="**/WEB-INF/lib/**"/> + <exclude name="**/WEB-INF/classes/**"/> + </fileset> + </war> </target> <target name="prepare" description="prepares the output directories">

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/plugins/memberof memberof.c, 1.6, 1.7
by Doctor Conrad 21 Apr '08

21 Apr '08

Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24125 Modified Files: memberof.c Log Message: Resolves: 439628 Summary: Check for indirect memberships when removing memberOf attributes. Index: memberof.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof/memberof.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- memberof.c 3 Apr 2008 23:04:11 -0000 1.6 +++ memberof.c 21 Apr 2008 17:45:15 -0000 1.7 @@ -87,7 +87,7 @@ typedef struct _memberofstringll { - char *dn; + const char *dn; void *next; } memberofstringll; @@ -135,8 +135,9 @@ static int memberof_del_dn_from_groups(Slapi_PBlock *pb, char *dn); static int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, char *type, plugin_search_entry_callback callback, void *callback_data); -static int memberof_is_group_member(Slapi_Value *groupdn, Slapi_Value *memberdn); -static int memberof_test_membership(Slapi_PBlock *pb, char *dn); +static int memberof_is_direct_member(Slapi_Value *groupdn, Slapi_Value *memberdn); +static int memberof_is_member(Slapi_Value *groupdn, Slapi_Value *memberdn); +static int memberof_test_membership(Slapi_PBlock *pb, char *group_dn); static int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data); static int memberof_del_dn_type_callback(Slapi_Entry *e, void *callback_data); static int memberof_replace_dn_type_callback(Slapi_Entry *e, void *callback_data); @@ -378,6 +379,12 @@ return rc; } +/* + * Does a callback search of "type=dn" under the db suffix that "dn" is in. + * If "dn" is a user, you'd want "type" to be "member". If "dn" is a group, + * you could want type to be either "member" or "memberOf" depending on the + * case. + */ int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, char *type, plugin_search_entry_callback callback, void *callback_data) { @@ -399,7 +406,6 @@ base_sdn = (Slapi_DN*)slapi_be_getsuffix(be,0); } - if(base_sdn) { int filter_size = @@ -804,6 +810,9 @@ Slapi_Entry *e = 0; memberofstringll *ll = 0; char *op_str = 0; + Slapi_Value *to_dn_val = slapi_value_new_string(op_to); + Slapi_Value *this_dn_val = slapi_value_new_string(op_this); + /* determine if this is a group op or single entry */ op_to_sdn = slapi_sdn_new_dn_byref(op_to); @@ -853,7 +862,6 @@ { /* group */ Slapi_Value *ll_dn_val = 0; - Slapi_Value *to_dn_val = slapi_value_new_string(op_to); Slapi_Attr *members = 0; ll = stack; @@ -865,7 +873,6 @@ if(0 == memberof_compare(&ll_dn_val, &to_dn_val)) { - slapi_value_free(&to_dn_val); slapi_value_free(&ll_dn_val); /* someone set up infinitely @@ -882,8 +889,6 @@ ll = ll->next; } - slapi_value_free(&to_dn_val); - /* do op on group */ slapi_log_error( SLAPI_LOG_PLUGIN, MEMBEROF_PLUGIN_SUBSYSTEM, @@ -913,9 +918,6 @@ } /* continue with operation */ { - Slapi_Value *to_dn_val = slapi_value_new_string(op_to); - Slapi_Value *this_dn_val = slapi_value_new_string(op_this); - /* We want to avoid listing a group as a memberOf itself * in case someone set up a circular grouping. */ @@ -925,15 +927,12 @@ MEMBEROF_PLUGIN_SUBSYSTEM, "memberof_modop_one_r: not processing memberOf " "operations on self entry: %s\n", this_dn_val); - slapi_value_free(&to_dn_val); - slapi_value_free(&this_dn_val); goto bail; } - /* We don't need the Slapi_Value copies of the DN's anymore */ - slapi_value_free(&to_dn_val); - slapi_value_free(&this_dn_val); - + /* We need to deal with delete cases separately. We may not + * want to remove a memberof attribute from an entry since + * it could still be a member in some other indirect manner. */ if(stack && LDAP_MOD_DELETE == mod_op) { if(memberof_is_legit_member(pb, group_dn, @@ -948,49 +947,64 @@ } } - /* single entry - do mod */ - mod_pb = slapi_pblock_new(); - - mods[0] = &mod; - if(LDAP_MOD_REPLACE == mod_op) - { - mods[1] = &replace_mod; - mods[2] = 0; - } - else - { - mods[1] = 0; - } + /* Check if the entry is still an indirect member. If it is, we + * don't want to remove the memberOf value. */ + if((LDAP_MOD_DELETE != mod_op) || (0 == memberof_is_member(this_dn_val, to_dn_val))) { + /* If we're about to add a memberOf value to an entry, we should first check + * if the value already exists. */ + if((LDAP_MOD_ADD == mod_op) && (slapi_entry_attr_has_syntax_value(e, + MEMBEROF_ATTR, this_dn_val))) + { + slapi_log_error( SLAPI_LOG_PLUGIN, MEMBEROF_PLUGIN_SUBSYSTEM, + "memberof_modop_one_r: memberOf value %s already exists in " + "entry %s\n", op_this, op_to); + goto bail; + } - val[0] = op_this; - val[1] = 0; + /* single entry - do mod */ + mod_pb = slapi_pblock_new(); - mod.mod_op = LDAP_MOD_REPLACE == mod_op?LDAP_MOD_DELETE:mod_op; - mod.mod_type = MEMBEROF_ATTR; - mod.mod_values = val; + mods[0] = &mod; + if(LDAP_MOD_REPLACE == mod_op) + { + mods[1] = &replace_mod; + mods[2] = 0; + } + else + { + mods[1] = 0; + } - if(LDAP_MOD_REPLACE == mod_op) - { - replace_val[0] = replace_with; - replace_val[1] = 0; + val[0] = op_this; + val[1] = 0; - replace_mod.mod_op = LDAP_MOD_ADD; - replace_mod.mod_type = MEMBEROF_ATTR; - replace_mod.mod_values = replace_val; - } + mod.mod_op = LDAP_MOD_REPLACE == mod_op?LDAP_MOD_DELETE:mod_op; + mod.mod_type = MEMBEROF_ATTR; + mod.mod_values = val; - slapi_modify_internal_set_pb( - mod_pb, op_to, - mods, 0, 0, - memberof_get_plugin_id(), 0); + if(LDAP_MOD_REPLACE == mod_op) + { + replace_val[0] = replace_with; + replace_val[1] = 0; - slapi_modify_internal_pb(mod_pb); + replace_mod.mod_op = LDAP_MOD_ADD; + replace_mod.mod_type = MEMBEROF_ATTR; + replace_mod.mod_values = replace_val; + } - slapi_pblock_get(mod_pb, - SLAPI_PLUGIN_INTOP_RESULT, - &rc); + slapi_modify_internal_set_pb( + mod_pb, op_to, + mods, 0, 0, + memberof_get_plugin_id(), 0); + + slapi_modify_internal_pb(mod_pb); + + slapi_pblock_get(mod_pb, + SLAPI_PLUGIN_INTOP_RESULT, + &rc); - slapi_pblock_destroy(mod_pb); + slapi_pblock_destroy(mod_pb); + } if(LDAP_MOD_DELETE == mod_op) { @@ -1010,6 +1024,8 @@ } bail: + slapi_value_free(&to_dn_val); + slapi_value_free(&this_dn_val); slapi_entry_free(e); return rc; } @@ -1284,11 +1300,12 @@ ((memberof_add_groups*)callback_data)->target_dn); } -/* memberof_is_group_member() - * tests membership of memberdn in group groupdn +/* memberof_is_direct_member() + * + * tests for direct membership of memberdn in group groupdn * returns non-zero when true, zero otherwise */ -int memberof_is_group_member(Slapi_Value *groupdn, Slapi_Value *memberdn) +int memberof_is_direct_member(Slapi_Value *groupdn, Slapi_Value *memberdn) { int rc = 0; Slapi_DN *sdn = 0; @@ -1316,9 +1333,164 @@ return rc; } +/* memberof_is_member() + * + * tests for membership of memberdn in group groupdn. This + * will check for both direct and indirect membership. + * returns non-zero when true, zero otherwise + */ +int memberof_is_member(Slapi_Value *groupdn, Slapi_Value *memberdn) +{ + memberofstringll *stack = 0; + + /* Do a quick check to see if the entry is a direct + * member before tracing through nested groups. */ + if(memberof_is_direct_member(groupdn, memberdn)) + { + /* entry is a direct member */ + return 1; + } + + return memberof_is_member_r(groupdn, memberdn, stack); +} + +/* memberof_is_member_r() + * + * Recursive function to do the work for the memberof_is_member() + * function. This will basically check if "memberdn" is a member + * of the group represented by "groupdn". Only "member" attribute + * values will be used to make this determination, not "memberOf" + * attribute values. + * + * returns non-zero when true, zero otherwise + */ +int memberof_is_member_r(Slapi_Value *groupdn, Slapi_Value *memberdn, memberofstringll *stack) +{ + Slapi_DN *member_sdn = 0; + Slapi_DN *base_sdn = 0; + Slapi_PBlock *search_pb = slapi_pblock_new(); + Slapi_Backend *be = 0; + Slapi_Value *ll_dn_val = 0; + memberofstringll *ll = stack; + char *filter_str = 0; + int rc = 0; + + /* Check if we've processed memberdn already to detect looped + * groupings. We want to do this right away to avoid any + * unecessary processing. */ + while(ll) + { + ll_dn_val = slapi_value_new_string(ll->dn); + + if(0 == memberof_compare(&ll_dn_val, &memberdn)) + { + slapi_value_free(&ll_dn_val); + + /* someone set up infinitely + * recursive groups - bail out */ + slapi_log_error( SLAPI_LOG_FATAL, + MEMBEROF_PLUGIN_SUBSYSTEM, + "memberof_is_member_r: group recursion" + " detected in %s\n" + ,slapi_value_get_string(memberdn)); + goto bail; + } + + slapi_value_free(&ll_dn_val); + ll = ll->next; + } + + /* push memberdn onto the stack to detect loops */ + ll = (memberofstringll*)slapi_ch_malloc(sizeof(memberofstringll)); + ll->dn = slapi_value_get_string(memberdn); + ll->next = stack; + + /* Find the backend suffix that memberdn is in so we can + * use it as a search base. */ + member_sdn = slapi_sdn_new_dn_byref(slapi_value_get_string(memberdn)); + be = slapi_be_select(member_sdn); + if(be) + { + base_sdn = (Slapi_DN*)slapi_be_getsuffix(be,0); + } + + /* Do a search for "member=<memberdn>". Go through matches to + * see if it is our group. If not, search for "member=<matchdn>" + * and keep looping until we've exhausted it. */ + if(base_sdn) + { + int filter_size = + (strlen(MEMBEROF_GROUP_ATTR) + + strlen(slapi_value_get_string(memberdn)) + 4); /* 4 for (=) + null */ + filter_str = (char*)slapi_ch_malloc(filter_size); + sprintf(filter_str, "(%s=%s)", MEMBEROF_GROUP_ATTR, slapi_value_get_string(memberdn)); + } + + if(filter_str) + { + slapi_search_internal_set_pb(search_pb, slapi_sdn_get_dn(base_sdn), + LDAP_SCOPE_SUBTREE, filter_str, 0, 0, + 0, 0, + memberof_get_plugin_id(), + 0); + + if(slapi_search_internal_pb(search_pb)) + { + /* get result and log an error */ + int res = 0; + slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_RESULT, &res); + slapi_log_error( SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM, + "memberof_is_member_r: error searching for groups: %d", + res); + goto bail; + } else { + Slapi_Entry **entries = NULL; + slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &entries); + if ( NULL != entries && NULL != entries[0]) + { + int i; + + for(i = 0; entries[i] != NULL; i++) + { + /* Iterate through the matches checking if the dn is our groupdn. */ + if(strcasecmp(slapi_entry_get_ndn(entries[i]), slapi_value_get_string(groupdn)) == 0) + { + /* This is the group we've been searching for, so + * set rc and bail. */ + rc = 1; + break; + } else { + /* This is not the group you're looking for... + * Find all of the groups that this group is a member of to + * see if any of them are the group we are trying to find. + * We do this by doing a recursive call on this function. */ + Slapi_Value *entrydn = slapi_value_new_string(slapi_entry_get_ndn(entries[i])); + rc = memberof_is_member_r(groupdn, entrydn, ll); + slapi_value_free(&entrydn); + } + } + } + } + } + + bail: + slapi_ch_free((void **)&ll); + slapi_ch_free_string(&filter_str); + slapi_sdn_free(&member_sdn); + slapi_free_search_results_internal(search_pb); + slapi_pblock_destroy(search_pb); + + return rc; +} + /* memberof_test_membership() + * + * Finds all entries who are a "memberOf" the group + * represented by "group_dn". For each matching entry, we + * call memberof_test_membership_callback(). + * * for each attribute in the memberof attribute - * determine if the entry is still a member + * determine if the entry is still a member. * * test each for direct membership * move groups entry is memberof to member group @@ -1326,12 +1498,19 @@ * iterate until a pass fails to move a group over to member groups * remaining groups should be deleted */ -int memberof_test_membership(Slapi_PBlock *pb, char *dn) +int memberof_test_membership(Slapi_PBlock *pb, char *group_dn) { - return memberof_call_foreach_dn(pb, dn, MEMBEROF_ATTR, + return memberof_call_foreach_dn(pb, group_dn, MEMBEROF_ATTR, memberof_test_membership_callback ,0); } +/* + * memberof_test_membership_callback() + * + * A callback function to do the work of memberof_test_membership(). + * Note that this not only tests membership, but updates the memberOf + * attributes in the entry to be correct. + */ int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data) { int rc = 0; @@ -1375,8 +1554,8 @@ while(val) { - /* test for membership */ - if(memberof_is_group_member(val, entry_dn)) + /* test for direct membership */ + if(memberof_is_direct_member(val, entry_dn)) { /* it is a member */ member_array[m_index] = val; @@ -1401,12 +1580,19 @@ { member_found = 0; + /* For each group that this entry is a verified member of, see if + * any of the candidate groups are members. If they are, add them + * to the list of verified groups that this entry is a member of. + */ while(outer_index < m_index) { int inner_index = 0; while(inner_index < c_index) { + /* Check for a special value in this position + * that indicates that the candidate was moved + * to the member array. */ if((void*)1 == candidate_array[inner_index]) { @@ -1415,7 +1601,7 @@ continue; } - if(memberof_is_group_member( + if(memberof_is_direct_member( candidate_array[inner_index], member_array[outer_index])) { @@ -1443,6 +1629,9 @@ outer_index = 0; while(outer_index < c_index) { + /* Check for a special value in this position + * that indicates that the candidate was moved + * to the member array. */ if((void*)1 == candidate_array[outer_index]) { /* item moved, skip */ @@ -1708,7 +1897,7 @@ Slapi_Attr *memberof = 0; Slapi_Value *memberdn = 0; int hint = 0; - char *delete_group_dn = 0; + const char *delete_group_dn = 0; slapi_log_error( SLAPI_LOG_TRACE, MEMBEROF_PLUGIN_SUBSYSTEM, "--> memberof_is_legit_member\n" );

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd filterentry.c, 1.6, 1.7
by Doctor Conrad 18 Apr '08

18 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12314 Modified Files: filterentry.c Log Message: Resolves: #428764 Summary: memory leaks in extensible filter code Description: applying the patch provided by Ulf Weltman 1) type is not consumed in attrlist_merge 2) although dnattrs is a linked list, only the first item was released. Test case filter: "(ou:dn:=groups)" Index: filterentry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/filterentry.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- filterentry.c 12 Oct 2007 18:03:42 -0000 1.6 +++ filterentry.c 18 Apr 2008 20:20:22 -0000 1.7 @@ -441,6 +441,7 @@ bv.bv_len = strlen(val); bvec[0] = &bv; attrlist_merge (&dnAttrs, type, bvec); + slapi_ch_free_string( &type ); } } ldap_value_free (avas); @@ -505,7 +506,7 @@ /* B) Also check the DN attributes for the attribute value */ Slapi_Attr* dnattrs= dn2attrs(slapi_entry_get_dn_const(e)); rc= test_ava_filter( callers_pb, e, dnattrs, &a, LDAP_FILTER_EQUALITY, 0 /* Don't Verify Access */ , 0 /* don't just verify access */, access_check_done ); - slapi_attr_free( &dnattrs ); + attrlist_free( dnattrs ); } } else @@ -520,7 +521,7 @@ /* D & F) Also check the DN attributes for the attribute value */ Slapi_Attr* dnattrs= dn2attrs(slapi_entry_get_dn_const(e)); mrf->mrf_match (mrf->mrf_object, e, dnattrs); - slapi_attr_free( &dnattrs ); + attrlist_free( dnattrs ); } } } @@ -573,7 +574,7 @@ /* B) Also check the DN attributes for the attribute value */ Slapi_Attr* dnattrs= dn2attrs(slapi_entry_get_dn_const(e)); rc= test_ava_filter( callers_pb, e, dnattrs, &a, LDAP_FILTER_EQUALITY, 0 /* Don't Verify Access */ , 0 /* don't just verify access */, access_check_done ); - slapi_attr_free( &dnattrs ); + attrlist_free( dnattrs ); } } else @@ -588,7 +589,7 @@ /* D & F) Also check the DN attributes for the attribute value */ Slapi_Attr* dnattrs= dn2attrs(slapi_entry_get_dn_const(e)); mrf->mrf_match (mrf->mrf_object, e, dnattrs); - slapi_attr_free( &dnattrs ); + attrlist_free( dnattrs ); } } }

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd filterentry.c, 1.6, 1.6.2.1
by Doctor Conrad 18 Apr '08

18 Apr '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12164 Modified Files: Tag: Directory_Server_8_0_Branch filterentry.c Log Message: Resolves: #428764 Summary: memory leaks in extensible filter code Description: applying the patch provided by Ulf Weltman 1) type is not consumed in attrlist_merge 2) although dnattrs is a linked list, only the first item was released. Test case filter: "(ou:dn:=groups)" Index: filterentry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/filterentry.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- filterentry.c 12 Oct 2007 18:03:42 -0000 1.6 +++ filterentry.c 18 Apr 2008 20:18:59 -0000 1.6.2.1 @@ -441,6 +441,7 @@ bv.bv_len = strlen(val); bvec[0] = &bv; attrlist_merge (&dnAttrs, type, bvec); + slapi_ch_free_string( &type ); } } ldap_value_free (avas); @@ -505,7 +506,7 @@ /* B) Also check the DN attributes for the attribute value */ Slapi_Attr* dnattrs= dn2attrs(slapi_entry_get_dn_const(e)); rc= test_ava_filter( callers_pb, e, dnattrs, &a, LDAP_FILTER_EQUALITY, 0 /* Don't Verify Access */ , 0 /* don't just verify access */, access_check_done ); - slapi_attr_free( &dnattrs ); + attrlist_free( dnattrs ); } } else @@ -520,7 +521,7 @@ /* D & F) Also check the DN attributes for the attribute value */ Slapi_Attr* dnattrs= dn2attrs(slapi_entry_get_dn_const(e)); mrf->mrf_match (mrf->mrf_object, e, dnattrs); - slapi_attr_free( &dnattrs ); + attrlist_free( dnattrs ); } } } @@ -573,7 +574,7 @@ /* B) Also check the DN attributes for the attribute value */ Slapi_Attr* dnattrs= dn2attrs(slapi_entry_get_dn_const(e)); rc= test_ava_filter( callers_pb, e, dnattrs, &a, LDAP_FILTER_EQUALITY, 0 /* Don't Verify Access */ , 0 /* don't just verify access */, access_check_done ); - slapi_attr_free( &dnattrs ); + attrlist_free( dnattrs ); } } else @@ -588,7 +589,7 @@ /* D & F) Also check the DN attributes for the attribute value */ Slapi_Attr* dnattrs= dn2attrs(slapi_entry_get_dn_const(e)); mrf->mrf_match (mrf->mrf_object, e, dnattrs); - slapi_attr_free( &dnattrs ); + attrlist_free( dnattrs ); } } }

1 0

[Fedora-directory-commits] dsmlgw/src/com/netscape/xmltools DSML2LDIF.java, 1.1.1.1, 1.2 DSMLReader.java, 1.1.1.1, 1.2 DSMLSAXBuilder.java, 1.1.1.1, 1.2 DSMLSAXHandler.java, 1.1.1.1, 1.2 DSMLWriter.java, 1.1.1.1, 1.2 GetOpt.java, 1.1.1.1, 1.2 LDIF2DSML.java, 1.1.1.1, 1.2 Makefile, 1.1.1.1, NONE
by Doctor Conrad 18 Apr '08

18 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/src/com/netscape/xmltools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22524/dsmlgw/src/com/netscape/xmltools Modified Files: DSML2LDIF.java DSMLReader.java DSMLSAXBuilder.java DSMLSAXHandler.java DSMLWriter.java GetOpt.java LDIF2DSML.java Removed Files: Makefile Log Message: initial commit of dsmlgw - updated license to plain old GPLv2 - updated to use axis1.4 Index: DSML2LDIF.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/DSML2LDIF.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DSML2LDIF.java 27 Apr 2007 20:57:20 -0000 1.1.1.1 +++ DSML2LDIF.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. Index: DSMLReader.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/DSMLReader.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DSMLReader.java 27 Apr 2007 20:57:19 -0000 1.1.1.1 +++ DSMLReader.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. Index: DSMLSAXBuilder.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/DSMLSAXBuilder.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DSMLSAXBuilder.java 27 Apr 2007 20:57:20 -0000 1.1.1.1 +++ DSMLSAXBuilder.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. Index: DSMLSAXHandler.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/DSMLSAXHandler.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DSMLSAXHandler.java 27 Apr 2007 20:57:19 -0000 1.1.1.1 +++ DSMLSAXHandler.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. Index: DSMLWriter.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/DSMLWriter.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DSMLWriter.java 27 Apr 2007 20:57:19 -0000 1.1.1.1 +++ DSMLWriter.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. Index: GetOpt.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/GetOpt.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- GetOpt.java 27 Apr 2007 20:57:20 -0000 1.1.1.1 +++ GetOpt.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. Index: LDIF2DSML.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/xmltools/LDIF2DSML.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- LDIF2DSML.java 27 Apr 2007 20:57:20 -0000 1.1.1.1 +++ LDIF2DSML.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. --- Makefile DELETED ---

1 0

[Fedora-directory-commits] dsmlgw/misc dsmlgw-deploy.wsdd, NONE, 1.1 fedora-ds-dsmlgw.spec, NONE, 1.1 log4j.properties, NONE, 1.1 logging.properties, NONE, 1.1 dsmlgw.cfg, 1.1.1.1, 1.2 server-config.wsdd, 1.1.1.1, 1.2
by Doctor Conrad 18 Apr '08

18 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/misc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22524/dsmlgw/misc Modified Files: dsmlgw.cfg server-config.wsdd Added Files: dsmlgw-deploy.wsdd fedora-ds-dsmlgw.spec log4j.properties logging.properties Log Message: initial commit of dsmlgw - updated license to plain old GPLv2 - updated to use axis1.4 --- NEW FILE dsmlgw-deploy.wsdd --- <deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"> <service name="dsmlgw" provider="Handler"> <parameter name="handlerClass" value="com.netscape.dsml.gateway.gatewayHandler"/> </service> </deployment> --- NEW FILE fedora-ds-dsmlgw.spec --- %define major_version 1.1 %define minor_version 0 %define pkgname dirsrv %define shortname dsmlgw Name: fedora-ds-dsmlgw Version: %{major_version}.%{minor_version} Release: 1%{?dist} Summary: Fedora Directory Server DSML Gateway Group: Applications/System License: GPLv2 URL: http://directory.fedoraproject.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2 Requires: java-1.7.0-icedtea BuildRequires: java-1.7.0-icedtea-devel BuildRequires: ant >= 1.6.2 BuildRequires: ldapjdk BuildRequires: axis BuildRequires: jakarta-commons-codec BuildRequires: classpathx-jaf %description A DSML to LDAP gateway. The application runs as a Java web application. The application is a DSMLv2 service that translates incoming DSMLv2 requests into LDAP and sends the requests to an LDAP server, gets the LDAP response, and translates that back into a DSMLv2 response. The jar file includes classes that can be used for command line utilities: * dsmlClient * dsmlSearch * LDIF2DSML - converts LDIF files to DSML format * DSML2LDIF - converts DSML to LDIF format %prep %setup -q %build %{ant} \ -Dglobaldist.dir=%{_javadir} \ -Dldapdist.dir=%{_javadir} \ -Daxis.dir=%{_javadir}/axis \ -Dbuild.dir=`pwd`/built \ -Ddist.dir=`pwd`/built %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_javadir} install -m644 built/%{shortname}.jar $RPM_BUILD_ROOT%{_javadir}/%{shortname}-%{version}.jar mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/data install -m644 dsml/*.dsml $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/data # create symlinks pushd $RPM_BUILD_ROOT%{_javadir} ln -s %{shortname}-%{version}.jar %{shortname}-%{major_version}.jar ln -s %{shortname}-%{version}.jar %{shortname}.jar popd %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %{_javadir}/%{shortname}-%{version}.jar %{_javadir}/%{shortname}-%{major_version}.jar %{_javadir}/%{shortname}.jar %{_datadir}/%{pkgname}/data/*.dsml %changelog * Mon Apr 7 2008 Rich Megginson <rmeggins(a)redhat.com> 1.1.0-1 - Initial creation --- NEW FILE log4j.properties --- # axis uses log4j - these are the log settings for axis # Set root category priority to INFO and its only appender to CONSOLE. #log4j.rootCategory=INFO, CONSOLE log4j.rootCategory=INFO, CONSOLE, LOGFILE # Set the enterprise logger category to FATAL and its only appender to CONSOLE. log4j.logger.org.apache.axis.enterprise=FATAL, CONSOLE # CONSOLE is set to be a ConsoleAppender using a PatternLayout. log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender log4j.appender.CONSOLE.Threshold=INFO log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout log4j.appender.CONSOLE.layout.ConversionPattern=- %m%n # LOGFILE is set to be a File appender using a PatternLayout. log4j.appender.LOGFILE=org.apache.log4j.FileAppender log4j.appender.LOGFILE.File=${catalina.base}/logs/axis.log log4j.appender.LOGFILE.Append=true log4j.appender.LOGFILE.Threshold=INFO log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout log4j.appender.LOGFILE.layout.ConversionPattern=%d %-4r [%t] %-5p %c %x - %m%n --- NEW FILE logging.properties --- # we write logs to files and to the console handlers = org.apache.juli.FileHandler,java.util.logging.ConsoleHandler ############################################################ # Handler specific properties. # Describes specific configuration info for Handlers. ############################################################ # log INFO level and higher to log file org.apache.juli.FileHandler.level = INFO org.apache.juli.FileHandler.directory = ${catalina.base}/logs org.apache.juli.FileHandler.prefix = dsmlgw. org.apache.juli.FileHandler.formatter = java.util.logging.SimpleFormatter # log WARNING level and higher to console (catalina.out using Tomcat) java.util.logging.ConsoleHandler.level = WARNING java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter # you can set gateway and class level debugging #com.netscape.dsml.gateway.level = INFO #com.netscape.dsml.gateway.gatewayHandler.level = FINER #com.netscape.dsml.gateway.Configuration.level = FINEST Index: dsmlgw.cfg =================================================================== RCS file: /cvs/dirsec/dsmlgw/misc/dsmlgw.cfg,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- dsmlgw.cfg 26 Apr 2007 22:29:03 -0000 1.1.1.1 +++ dsmlgw.cfg 18 Apr 2008 16:43:38 -0000 1.2 @@ -11,25 +11,6 @@ # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# # # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. Index: server-config.wsdd =================================================================== RCS file: /cvs/dirsec/dsmlgw/misc/server-config.wsdd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- server-config.wsdd 26 Apr 2007 22:29:03 -0000 1.1.1.1 +++ server-config.wsdd 18 Apr 2008 16:43:38 -0000 1.2 @@ -12,25 +12,6 @@ this Program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - In addition, as a special exception, Red Hat, Inc. gives You the additional - right to link the code of this Program with code not covered under the GNU - General Public License ("Non-GPL Code") and to distribute linked combinations - including the two, subject to the limitations in this paragraph. Non-GPL Code - permitted under this exception must only link to the code of this Program - through those well defined interfaces identified in the file named EXCEPTION - found in the source code files (the "Approved Interfaces"). The files of - Non-GPL Code may instantiate templates or use macros or inline functions from - the Approved Interfaces without causing the resulting work to be covered by - the GNU General Public License. Only Red Hat, Inc. may make changes or - additions to the list of Approved Interfaces. You must obey the GNU General - Public License in all respects for all of the Program code and other code used - in conjunction with the Program except the Non-GPL Code covered by this - exception. If you modify this file, you may extend this exception to your - version of the file, but you are not obligated to do so. If you do not wish to - provide this exception without modification, you must delete this exception - statement from your version and license this file solely under the GPL without - exception. - Copyright (C) 2005 Red Hat, Inc. All rights reserved.

1 0

[Fedora-directory-commits] dsmlgw/src/com/netscape/dsml/test SOAPClient.java, 1.1.1.1, 1.2 dsmlClient.java, 1.1.1.1, 1.2 dsmlSearch.java, 1.1.1.1, 1.2
by Doctor Conrad 18 Apr '08

18 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/src/com/netscape/dsml/test In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22524/dsmlgw/src/com/netscape/dsml/test Modified Files: SOAPClient.java dsmlClient.java dsmlSearch.java Log Message: initial commit of dsmlgw - updated license to plain old GPLv2 - updated to use axis1.4 Index: SOAPClient.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/test/SOAPClient.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- SOAPClient.java 26 Apr 2007 22:28:54 -0000 1.1.1.1 +++ SOAPClient.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: dsmlClient.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/test/dsmlClient.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- dsmlClient.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ dsmlClient.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,35 +11,14 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * --- END COPYRIGHT BLOCK --- */ package com.netscape.dsml.test; -import javax.xml.parsers.*; import org.w3c.dom.*; import org.w3c.dom.traversal.*; -import org.xml.sax.SAXException; import java.io.IOException; import java.io.File; Index: dsmlSearch.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/test/dsmlSearch.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- dsmlSearch.java 26 Apr 2007 22:28:54 -0000 1.1.1.1 +++ dsmlSearch.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved.

1 0

[Fedora-directory-commits] dsmlgw/src/com/netscape/dsml/gateway BatchProcessor.java, 1.1.1.1, 1.2 Configuration.java, 1.1.1.1, 1.2 Constants.java, 1.1.1.1, 1.2 GenericOperation.java, 1.1.1.1, 1.2 IConnMgrFactoryFunctor.java, 1.1.1.1, 1.2 IConnectionManager.java, 1.1.1.1, 1.2 LDAPAuthenticator.java, 1.1.1.1, 1.2 OperationAdd.java, 1.1.1.1, 1.2 OperationAuth.java, 1.1.1.1, 1.2 OperationCompare.java, 1.1.1.1, 1.2 OperationDelete.java, 1.1.1.1, 1.2 OperationExtended.java, 1.1.1.1, 1.2 OperationModify.java, 1.1.
by Doctor Conrad 18 Apr '08

18 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22524/dsmlgw/src/com/netscape/dsml/gateway Modified Files: BatchProcessor.java Configuration.java Constants.java GenericOperation.java IConnMgrFactoryFunctor.java IConnectionManager.java LDAPAuthenticator.java OperationAdd.java OperationAuth.java OperationCompare.java OperationDelete.java OperationExtended.java OperationModify.java OperationModifyDN.java OperationSearch.java ParseControl.java ParseFilter.java ParseValue.java ProxyConnMgrFactory.java ProxyConnectionManager.java gatewayContext.java gatewayException.java gatewayHandler.java gatewayService.java Log Message: initial commit of dsmlgw - updated license to plain old GPLv2 - updated to use axis1.4 Index: BatchProcessor.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- BatchProcessor.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ BatchProcessor.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: Configuration.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/Configuration.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Configuration.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ Configuration.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. @@ -37,14 +18,16 @@ package com.netscape.dsml.gateway; import java.io.*; +import java.net.URLClassLoader; import java.util.Properties; -import java.util.logging.*; +import java.util.logging.Level; +import java.util.logging.Logger; public class Configuration { private static Logger logger = Logger.getLogger("com.netscape.dsml.gateway.Configuration"); - + private static final String DSMLGWCFG = "dsmlgw.cfg"; + private static final String DSMLGW_CONFIG_DIR = "DSMLGW_CONFIG_DIR"; private static String propertiesFilename; - private final static String header = "properties file for the Netscape DSMLGW"; private final static String[][] defaults = new String[][] { { "MinPool", "5" }, { "MaxPool", "10" }, @@ -61,12 +44,77 @@ private static Object lock = new Object(); private static Properties properties = null; - /** Creates a new instance of Config */ + /** Gets the file DSMLGWCFG from the + * classpath (using the class loader findResource/getResource) + * Returns the absolute path if found, or null if not found + */ + private String getCfgFromClassPath() { + String filename = null; + ClassLoader cl = this.getClass().getClassLoader(); + if (cl instanceof URLClassLoader) { + if (((URLClassLoader) cl).findResource(DSMLGWCFG) != null) { + filename = ((URLClassLoader) cl).findResource(DSMLGWCFG).getPath(); + } else { + logger.log( Level.FINE, "Configuration.getCfgFromClassPath: " + + "could not find the file " + DSMLGWCFG + + " in the class path"); + } + } else { + logger.log(Level.FINE, "Configuration.getCfgFromClassPath: " + + "the classloader for this class is not a url class loader"); + } + + return filename; + } + + /** Creates a new instance of Config + * First, look for the config file in the user's home directory + * Next, look for the config file in the DSMLGW_CONFIG_DIR env. var. + * Finally, look in the classpath */ private Configuration() { - propertiesFilename = System.getProperty("user.home","") + System.getProperty("file.separator") + "dsmlgw.cfg"; - logger.log( Level.CONFIG, "using properties filename " + propertiesFilename); - load(); + propertiesFilename = System.getProperty("user.home","") + + System.getProperty("file.separator") + DSMLGWCFG; + logger.log( Level.CONFIG, "trying properties filename " + propertiesFilename); + try { + load(); + } catch (FileNotFoundException fnfe) { + propertiesFilename = null; + } + if ((propertiesFilename == null) && + (System.getenv(DSMLGW_CONFIG_DIR) != null)) { + propertiesFilename = System.getenv(DSMLGW_CONFIG_DIR) + + System.getProperty("file.separator") + DSMLGWCFG; + logger.log( Level.CONFIG, "trying properties filename " + propertiesFilename); + try { + load(); + } catch (FileNotFoundException fnfe2) { + logger.log( Level.CONFIG, "no config file " + propertiesFilename); + propertiesFilename = null; + } + } + if (propertiesFilename == null) { + propertiesFilename = getCfgFromClassPath(); + if (propertiesFilename != null) { + logger.log( Level.CONFIG, "trying properties filename " + propertiesFilename); + try { + load(); + } catch (FileNotFoundException fnfe2) { + logger.log( Level.CONFIG, "no config file " + DSMLGWCFG + + " found, using defaults"); + propertiesFilename = null; + } + } else { + logger.log( Level.CONFIG, "Could not find properties file " + + DSMLGWCFG + " in classpath" ); + } + } + if (propertiesFilename == null) { + logger.log( Level.INFO, "config file " + DSMLGWCFG + + " not found, using defaults"); + } else { + logger.log( Level.INFO, "using config file " + propertiesFilename); + } } public static Configuration getInstance() { @@ -81,7 +129,7 @@ } - private void load() { + private void load() throws FileNotFoundException { try { properties = new Properties(); @@ -96,12 +144,12 @@ } catch (java.io.FileNotFoundException e) { - System.err.println("Can't find properties file: " + propertiesFilename + ". " + - "Using defaults."); + logger.log(Level.WARNING, "Can't find properties file: " + propertiesFilename); + throw e; } catch (java.io.IOException e) { - System.err.println("Can't read properties file: " + propertiesFilename + ". " + + logger.log(Level.SEVERE, "Can't read properties file: " + propertiesFilename + ". " + "Using defaults."); } Index: Constants.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/Constants.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Constants.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ Constants.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: GenericOperation.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- GenericOperation.java 26 Apr 2007 22:28:56 -0000 1.1.1.1 +++ GenericOperation.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: IConnMgrFactoryFunctor.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- IConnMgrFactoryFunctor.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ IConnMgrFactoryFunctor.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: IConnectionManager.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- IConnectionManager.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ IConnectionManager.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: LDAPAuthenticator.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- LDAPAuthenticator.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ LDAPAuthenticator.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: OperationAdd.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- OperationAdd.java 26 Apr 2007 22:28:56 -0000 1.1.1.1 +++ OperationAdd.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: OperationAuth.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- OperationAuth.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ OperationAuth.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: OperationCompare.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- OperationCompare.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ OperationCompare.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: OperationDelete.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- OperationDelete.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ OperationDelete.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: OperationExtended.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- OperationExtended.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ OperationExtended.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: OperationModify.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationModify.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- OperationModify.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ OperationModify.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: OperationModifyDN.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- OperationModifyDN.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ OperationModifyDN.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: OperationSearch.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- OperationSearch.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ OperationSearch.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,41 +11,20 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * --- END COPYRIGHT BLOCK --- */ package com.netscape.dsml.gateway; +import java.util.logging.Level; +import java.util.logging.Logger; + import netscape.ldap.*; import org.w3c.dom.*; -import java.util.logging.*; -import org.w3c.dom.DOMImplementation; import org.w3c.dom.Node; -import org.w3c.dom.traversal.NodeIterator; -import org.w3c.dom.traversal.DocumentTraversal; -import org.w3c.dom.traversal.TreeWalker; import org.w3c.dom.traversal.NodeFilter; class OperationSearch extends GenericOperation { @@ -55,7 +34,7 @@ javax.xml.soap.MessageFactory messageFactory = null ; javax.xml.soap.SOAPFactory sef = null; private static Logger logger = - Logger.getLogger("com.netscape.dsml.service.ProxyConnectionManager"); + Logger.getLogger("com.netscape.dsml.gateway.OperationSearch"); OperationSearch(){ try { @@ -77,7 +56,6 @@ public javax.xml.soap.SOAPElement getResponse(gatewayContext ctx) { - root = ctx.getRootNode(); @@ -240,10 +218,18 @@ ldapConn = ctx.getLdapConnection(); - if (ctx.getConstraints() != null) - results = ldapConn.search(dn, scope, filterString, attributeList, false, ctx.getConstraints() ); - else - results = ldapConn.search( dn, scope, filterString, attributeList, false); + if (ctx.getLdapConnection() == null) { + logger.log(Level.WARNING, "no LDAP connection"); + results = null; + // either we could not connect for some reason (e.g. network problems) + // or the LDAP server is down + resultCode = netscape.ldap.client.opers.JDAPResult.CONNECT_ERROR; + } else if (ctx.getConstraints() != null) { + results = ldapConn.search(dn, scope, filterString, attributeList, false, + ctx.getConstraints()); + } else { + results = ldapConn.search(dn, scope, filterString, attributeList, false); + } } catch (LDAPException E) { resultCode = E.getLDAPResultCode(); Index: ParseControl.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ParseControl.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ParseControl.java 26 Apr 2007 22:28:56 -0000 1.1.1.1 +++ ParseControl.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: ParseFilter.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ParseFilter.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ ParseFilter.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: ParseValue.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ParseValue.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ParseValue.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ ParseValue.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: ProxyConnMgrFactory.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ProxyConnMgrFactory.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ ProxyConnMgrFactory.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: ProxyConnectionManager.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ProxyConnectionManager.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ ProxyConnectionManager.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. @@ -38,7 +19,9 @@ import java.lang.Exception ; import java.util.*; -import java.util.logging.*; +import java.util.logging.Level; +import java.util.logging.Logger; + import netscape.ldap.LDAPConnection; import netscape.ldap.util.ConnectionPool; import netscape.ldap.LDAPConstraints; @@ -65,7 +48,7 @@ private static Logger logger = - Logger.getLogger("com.netscape.dsml.service.ProxyConnectionManager"); + Logger.getLogger("com.netscape.dsml.gateway.ProxyConnectionManager"); static private ConnectionPool _ldapPool = null; static private ConnectionPool _ldapLoginPool = null; static private LDAPConnection _trialConn = null; Index: gatewayContext.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- gatewayContext.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ gatewayContext.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: gatewayException.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/gatewayException.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- gatewayException.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ gatewayException.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. Index: gatewayHandler.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- gatewayHandler.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ gatewayHandler.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. @@ -37,34 +18,22 @@ package com.netscape.dsml.gateway; -import java.io.*; -import java.util.Iterator; import javax.xml.namespace.QName; -import javax.xml.parsers.*; -import javax.xml.rpc.handler.Handler; import javax.xml.rpc.handler.HandlerInfo; import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.Name; +import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPHeader; -import javax.xml.soap.SOAPHeaderElement; -import javax.xml.soap.SOAPMessage; -import javax.xml.soap.SOAPPart; -import javax.xml.soap.SOAPConstants; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import org.w3c.dom.Document; -import org.xml.sax.*; -import org.w3c.dom.*; -import javax.xml.soap.*; import org.apache.axis.AxisFault; import org.apache.axis.Message; import org.apache.axis.MessageContext; import org.apache.axis.handlers.BasicHandler; import org.apache.commons.codec.binary.Base64; +import java.util.logging.Level; +import java.util.logging.Logger; + public class gatewayHandler extends BasicHandler { + private static Logger logger = Logger.getLogger("com.netscape.dsml.gateway.gatewayHandler"); private HandlerInfo handlerInfo; static private javax.xml.soap.MessageFactory messageFactory ; static private javax.xml.soap.SOAPFactory sef ; @@ -72,18 +41,27 @@ public gatewayHandler() { super(); + System.err.println("gatewayHandler.gatewayHandler: logger class " + + "is " + logger.getClass().getCanonicalName() + + " logger name is " + logger.getName() + + " parent class is " + logger.getParent().getClass().getCanonicalName() + + " parent name is " + logger.getParent().getName()); + logger.entering("gatewayHandler", "gatewayHandler"); try { messageFactory = javax.xml.soap.MessageFactory.newInstance(); sef = javax.xml.soap.SOAPFactory.newInstance(); } catch (Exception e) { } + logger.exiting("gatewayHandler", "gatewayHandler"); } public void invoke(MessageContext context) throws AxisFault { + logger.entering("gatewayHandler", "invoke"); if (context.getPastPivot() == false) { handleRequest(context); } + logger.exiting("gatewayHandler", "invoke"); } public void cleanup() { Index: gatewayService.java =================================================================== RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/gatewayService.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- gatewayService.java 26 Apr 2007 22:28:55 -0000 1.1.1.1 +++ gatewayService.java 18 Apr 2008 16:43:39 -0000 1.2 @@ -11,25 +11,6 @@ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * - * In addition, as a special exception, Red Hat, Inc. gives You the additional - * right to link the code of this Program with code not covered under the GNU - * General Public License ("Non-GPL Code") and to distribute linked combinations - * including the two, subject to the limitations in this paragraph. Non-GPL Code - * permitted under this exception must only link to the code of this Program - * through those well defined interfaces identified in the file named EXCEPTION - * found in the source code files (the "Approved Interfaces"). The files of - * Non-GPL Code may instantiate templates or use macros or inline functions from - * the Approved Interfaces without causing the resulting work to be covered by - * the GNU General Public License. Only Red Hat, Inc. may make changes or - * additions to the list of Approved Interfaces. You must obey the GNU General - * Public License in all respects for all of the Program code and other code used - * in conjunction with the Program except the Non-GPL Code covered by this - * exception. If you modify this file, you may extend this exception to your - * version of the file, but you are not obligated to do so. If you do not wish to - * provide this exception without modification, you must delete this exception - * statement from your version and license this file solely under the GPL without - * exception. - * * * Copyright (C) 2005 Red Hat, Inc. * All rights reserved.

1 0

[Fedora-directory-commits] dsmlgw/dsml European.dsml, 1.1.1.1, 1.2 Example-roles.dsml, 1.1.1.1, 1.2 Example.dsml, 1.1.1.1, 1.2
by Doctor Conrad 18 Apr '08

18 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/dsml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22524/dsmlgw/dsml Modified Files: European.dsml Example-roles.dsml Example.dsml Log Message: initial commit of dsmlgw - updated license to plain old GPLv2 - updated to use axis1.4 Index: European.dsml =================================================================== RCS file: /cvs/dirsec/dsmlgw/dsml/European.dsml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- European.dsml 26 Apr 2007 22:29:01 -0000 1.1.1.1 +++ European.dsml 18 Apr 2008 16:43:38 -0000 1.2 @@ -12,25 +12,6 @@ this Program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - In addition, as a special exception, Red Hat, Inc. gives You the additional - right to link the code of this Program with code not covered under the GNU - General Public License ("Non-GPL Code") and to distribute linked combinations - including the two, subject to the limitations in this paragraph. Non-GPL Code - permitted under this exception must only link to the code of this Program - through those well defined interfaces identified in the file named EXCEPTION - found in the source code files (the "Approved Interfaces"). The files of - Non-GPL Code may instantiate templates or use macros or inline functions from - the Approved Interfaces without causing the resulting work to be covered by - the GNU General Public License. Only Red Hat, Inc. may make changes or - additions to the list of Approved Interfaces. You must obey the GNU General - Public License in all respects for all of the Program code and other code used - in conjunction with the Program except the Non-GPL Code covered by this - exception. If you modify this file, you may extend this exception to your - version of the file, but you are not obligated to do so. If you do not wish to - provide this exception without modification, you must delete this exception - statement from your version and license this file solely under the GPL without - exception. - Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. Copyright (C) 2005 Red Hat, Inc. Index: Example-roles.dsml =================================================================== RCS file: /cvs/dirsec/dsmlgw/dsml/Example-roles.dsml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Example-roles.dsml 26 Apr 2007 22:29:03 -0000 1.1.1.1 +++ Example-roles.dsml 18 Apr 2008 16:43:38 -0000 1.2 @@ -12,25 +12,6 @@ this Program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - In addition, as a special exception, Red Hat, Inc. gives You the additional - right to link the code of this Program with code not covered under the GNU - General Public License ("Non-GPL Code") and to distribute linked combinations - including the two, subject to the limitations in this paragraph. Non-GPL Code - permitted under this exception must only link to the code of this Program - through those well defined interfaces identified in the file named EXCEPTION - found in the source code files (the "Approved Interfaces"). The files of - Non-GPL Code may instantiate templates or use macros or inline functions from - the Approved Interfaces without causing the resulting work to be covered by - the GNU General Public License. Only Red Hat, Inc. may make changes or - additions to the list of Approved Interfaces. You must obey the GNU General - Public License in all respects for all of the Program code and other code used - in conjunction with the Program except the Non-GPL Code covered by this - exception. If you modify this file, you may extend this exception to your - version of the file, but you are not obligated to do so. If you do not wish to - provide this exception without modification, you must delete this exception - statement from your version and license this file solely under the GPL without - exception. - Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. Copyright (C) 2005 Red Hat, Inc. Index: Example.dsml =================================================================== RCS file: /cvs/dirsec/dsmlgw/dsml/Example.dsml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Example.dsml 26 Apr 2007 22:28:57 -0000 1.1.1.1 +++ Example.dsml 18 Apr 2008 16:43:38 -0000 1.2 @@ -12,25 +12,6 @@ this Program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - In addition, as a special exception, Red Hat, Inc. gives You the additional - right to link the code of this Program with code not covered under the GNU - General Public License ("Non-GPL Code") and to distribute linked combinations - including the two, subject to the limitations in this paragraph. Non-GPL Code - permitted under this exception must only link to the code of this Program - through those well defined interfaces identified in the file named EXCEPTION - found in the source code files (the "Approved Interfaces"). The files of - Non-GPL Code may instantiate templates or use macros or inline functions from - the Approved Interfaces without causing the resulting work to be covered by - the GNU General Public License. Only Red Hat, Inc. may make changes or - additions to the list of Approved Interfaces. You must obey the GNU General - Public License in all respects for all of the Program code and other code used - in conjunction with the Program except the Non-GPL Code covered by this - exception. If you modify this file, you may extend this exception to your - version of the file, but you are not obligated to do so. If you do not wish to - provide this exception without modification, you must delete this exception - statement from your version and license this file solely under the GPL without - exception. - Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. Copyright (C) 2005 Red Hat, Inc.

1 0

[Fedora-directory-commits] dsmlgw LICENSE, NONE, 1.1 build.properties, NONE, 1.1 build.xml, 1.1.1.1, 1.2 Makefile, 1.1.1.1, NONE
by Doctor Conrad 18 Apr '08

18 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22524/dsmlgw Modified Files: build.xml Added Files: LICENSE build.properties Removed Files: Makefile Log Message: initial commit of dsmlgw - updated license to plain old GPLv2 - updated to use axis1.4 --- NEW FILE LICENSE --- This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --- NEW FILE build.properties --- axisbin.url=http://apache.mirrors.tds.net/ws/axis/1_4/ #axisbin.dir=/path/to/ axisbin.tgz=axis-bin-1_4.tar.gz axisbin.tar=axis-bin-1_4.tar axisname=axis-1_4 #havelocalaxisbin=true Index: build.xml =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- build.xml 26 Apr 2007 22:28:54 -0000 1.1.1.1 +++ build.xml 18 Apr 2008 16:43:38 -0000 1.2 @@ -12,99 +12,143 @@ this Program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - In addition, as a special exception, Red Hat, Inc. gives You the additional - right to link the code of this Program with code not covered under the GNU - General Public License ("Non-GPL Code") and to distribute linked combinations - including the two, subject to the limitations in this paragraph. Non-GPL Code - permitted under this exception must only link to the code of this Program - through those well defined interfaces identified in the file named EXCEPTION - found in the source code files (the "Approved Interfaces"). The files of - Non-GPL Code may instantiate templates or use macros or inline functions from - the Approved Interfaces without causing the resulting work to be covered by - the GNU General Public License. Only Red Hat, Inc. may make changes or - additions to the list of Approved Interfaces. You must obey the GNU General - Public License in all respects for all of the Program code and other code used - in conjunction with the Program except the Non-GPL Code covered by this - exception. If you modify this file, you may extend this exception to your - version of the file, but you are not obligated to do so. If you do not wish to - provide this exception without modification, you must delete this exception - statement from your version and license this file solely under the GPL without - exception. - - Copyright (C) 2005 Red Hat, Inc. All rights reserved. END COPYRIGHT BLOCK -->  - <project name="dsmlgw" default="dist" basedir="."> - -<property name="mcom.root" value="../../.."/> -<property name="globaldist.dir" value="${mcom.root}/../dist/classes"/> -<property name="ldapdist.dir" value="${mcom.root}/../dist/classes"/> -<property name="app.name" value="dsmlgw"/> -<property name="taglib.name" value="dsmlgw"/> - -<property name="ldapjdk.jar" value="${ldapdist.dir}/ldapjdk.jar"/> -<property name="activation.jar" value="${globaldist.dir}/activation.jar"/> -<property name="jaf.jar" value="${globaldist.dir}/jaf.jar"/> -<property name="jaxrpc-api.jar" value="${globaldist.dir}/jaxrpc-api.jar"/> -<property name="jaxrpc.jar" value="${globaldist.dir}/jaxrpc.jar"/> -<property name="saaj.jar" value="${globaldist.dir}/saaj.jar"/> -<property name="xercesImpl.jar" value="${globaldist.dir}/xercesImpl.jar"/> -<property name="xmlParserAPIs.jar" value="${globaldist.dir}/xml-apis.jar"/> -<property name="axis.jar" value="${globaldist.dir}/axis.jar"/> -<property name="codec.jar" value="${globaldist.dir}/jakarta-commons-codec.jar"/> -<property environment="env"/> - -<path id="class.path"> -<pathelement location="${ldapjdk.jar}"/> -<pathelement location="${activation.jar}"/> -<pathelement location="${jaf.jar}"/> -<pathelement location="${jaxrpc-api.jar}"/> -<pathelement location="${jaxrpc.jar}"/> -<pathelement location="${saaj.jar}"/> - -<pathelement location="${xercesImpl.jar}"/> -<pathelement location="${xmlParserAPIs.jar}"/> -<pathelement location="${axis.jar}"/> -<pathelement location="${codec.jar}"/> -</path> - -<property name="build.dir" value="${mcom.root}/built/dsmlgw"/> -<property name="dist.dir" value="${mcom.root}/../dist/dsmlgw"/> - - + <property file="build.properties" /> -<target name="prepare" description="prepares the output directories"> - <mkdir dir="${build.dir}"/> - <mkdir dir="${dist.dir}"/> -</target> - -<target name="library" depends="classpath,prepare" description="builds it"> -<javac srcdir="." destdir="${build.dir}" classpathref="class.path" debug="on"/> -</target> - - -  -<target name="dist" depends="classpath,library" description="makes the distribution"> - <jar jarfile="${dist.dir}/dsmlgw.jar" basedir="${build.dir}"/> - - </target> - - <target name="clean" description="makes clean"> - <delete dir="${build.dir}"/> - <delete dir="${dist.dir}"/> - </target> - -<property name="classpath" refid="class.path"/> - <target name="classpath"> - <echo message="${classpath}"/> - </target> +  + <property name="globaldist.dir" location="/usr/share/java" /> + <property name="ldapdist.dir" location="/usr/share/java" /> + +  + <property name="axisdist.dir" location="/usr/share/java/axis" /> + <property name="axis.lib.dir" location="/usr/share/java/axis" /> + +  + <property name="saaj.jar" location="${axis.lib.dir}/saaj.jar" /> + <property name="jaxrpc.jar" location="${axis.lib.dir}/jaxrpc.jar" /> + <property name="axis.jar" location="${axis.lib.dir}/axis.jar" /> + <property name="ldapjdk.jar" location="${ldapdist.dir}/ldapjdk.jar" /> + <property name="activation.jar" location="${globaldist.dir}/activation.jar" /> + <property name="codec.jar" location="${globaldist.dir}/jakarta-commons-codec.jar" /> + +  + <property name="mail.jar" location="${globaldist.dir}/mail.jar" /> + + <property environment="env" /> + + <path id="class.path"> + <pathelement location="${ldapjdk.jar}" /> + <pathelement location="${saaj.jar}" /> + <pathelement location="${axis.jar}" /> + <pathelement location="${codec.jar}" /> + <pathelement location="${activation.jar}" /> + <pathelement location="${jaxrpc.jar}" /> + </path> + +  + <property name="build.dir" value="${mcom.root}/built/dsmlgw" /> +  + <property name="dist.dir" value="${mcom.root}/../dist/dsmlgw" /> +  + <available file="${axisdist.dir}/webapps/axis" type="dir" + property="haveaxisbinpkg"/> + <available file="${axisdist.dir}" type="dir" + property="havelocalaxisbin"/> + + <target name="help" description="get help"> + <echo> +There are 6 jar files required to build ${ant.project.name}, specified +by the following properties: + ldapjdk.jar - the Mozilla LDAP Java SDK + codec.jar - the Jakarta Commons codec + activation.jar - the Java Activation Framework - Sun or Classpathx +These 3 are provided by Axis: + axis.jar, saaj.jar, jaxrpc.jar + +On many linux systems, all of these jars are available in /usr/share/java +or whatever the java datadir is. Axis is usually provided in the axis +subdir of this. + +If you want to build using the axis binary distribution from ws.apache.org/axis, +download and unpack it. The top level directory will be axis-1_4. The two main +subdirs that ${ant.project.name} requires are "lib" and "webapps". lib is needed +during building, to find the axis jars listed above. webapps is used in packaging +the ${ant.project.name} as a standard web app or WAR. In order to use the binary +distribution, you must specify the properties on the command line like this: +-Daxisdist.dir=/path/to/axis-1_4 -Daxis.lib.dir=/path/to/axis-1_4/lib + </echo> + </target> + + <target name="unzipaxisbinlocal" description="unzip a local axis bin tgz" if="havelocalaxisbin"> + <gunzip dest="${dist.dir}/${axisbin.tar}" src="${axisbin.dir}/${axisbin.tgz}" /> + </target> + + <target name="unzipaxisbinremote" description="download and unzip a remote axis bin tgz" unless="havelocalaxisbin"> + <get dest="${dist.dir}/${axisbin.tgz}" src="${axisbin.url}${axisbin.tgz}" verbose="true" usetimestamp="true" /> + <gunzip dest="${dist.dir}/${axisbin.tar}" src="${dist.dir}/${axisbin.tgz}" /> + </target> + +  + <target name="useaxisbinpkg" description="extract the webapps part of the binary axis tgz" if="haveaxisbinpkg" depends="unzipaxisbinlocal,unzipaxisbinremote"> + <untar src="${dist.dir}/${axisbin.tar}" dest="${dist.dir}"> + <patternset> + <include name="${axisname}/webapps/axis/**" /> + </patternset> + </untar> + <move file="${dist.dir}/${axisname}/webapps" todir="${dist.dir}" /> + <delete dir="${dist.dir}/${axisname}" /> + <delete file="${dist.dir}/${axisbin.tar}" /> + </target> + + <target name="mkwebappsdirs" description="make the webapps directory layout" + unless="haveaxisbinpkg"> + <mkdir dir="${dist.dir}/webapps/axis/WEB-INF/lib" /> + <mkdir dir="${dist.dir}/webapps/axis/WEB-INF/classes" /> + </target> + + <target name="pkgwebapp" description="create the webapps layout, prepare for WAR" depends="dist,useaxisbinpkg,mkwebappsdirs"> + </target> + + <target name="prepare" description="prepares the output directories"> + <mkdir dir="${build.dir}" /> + <mkdir dir="${dist.dir}" /> + </target> + + <target name="library" depends="classpath,prepare" description="builds it"> + <javac srcdir="." destdir="${build.dir}" classpathref="class.path" debug="on" /> + </target> + + +  + <target name="dist" depends="classpath,library" description="makes the distribution"> + <jar jarfile="${dist.dir}/dsmlgw.jar" basedir="${build.dir}" /> + </target> + + <target name="clean" description="makes clean"> + <delete dir="${build.dir}" /> + <delete dir="${dist.dir}" /> + </target> + + <property name="classpath" refid="class.path" /> + <target name="classpath"> + <echo message="${classpath}" /> + </target> </project> --- Makefile DELETED ---

1 0

[Fedora-directory-commits] adminserver configure.ac, 1.24.2.1, 1.24.2.2 aclocal.m4, 1.38.2.1, 1.38.2.2 configure, 1.42.2.1, 1.42.2.2 missing, 1.28.2.1, 1.28.2.2 install-sh, 1.28.2.1, 1.28.2.2 depcomp, 1.28.2.1, 1.28.2.2 config.sub, 1.28.2.1, 1.28.2.2 config.guess, 1.28.2.1, 1.28.2.2 compile, 1.27.2.1, 1.27.2.2 Makefile.in, 1.45.2.1, 1.45.2.2
by Doctor Conrad 15 Apr '08

15 Apr '08

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8064 Modified Files: Tag: Directory_Server_8_0_Branch configure.ac aclocal.m4 configure missing install-sh depcomp config.sub config.guess compile Makefile.in Log Message: bump rev to 1.1.4 Index: configure.ac =================================================================== RCS file: /cvs/dirsec/adminserver/configure.ac,v retrieving revision 1.24.2.1 retrieving revision 1.24.2.2 diff -u -r1.24.2.1 -r1.24.2.2 --- configure.ac 15 Apr 2008 16:44:34 -0000 1.24.2.1 +++ configure.ac 15 Apr 2008 16:47:30 -0000 1.24.2.2 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dirsrv-admin], [1.1.3], [http://bugzilla.redhat.com/] +AC_INIT([dirsrv-admin], [1.1.4], [http://bugzilla.redhat.com/] AC_CONFIG_SRCDIR([admserv/cgi-src40/viewlog.c]) AM_INIT_AUTOMAKE([1.9 foreign subdir-objects]) AM_MAINTAINER_MODE Index: configure =================================================================== RCS file: /cvs/dirsec/adminserver/configure,v retrieving revision 1.42.2.1 retrieving revision 1.42.2.2 diff -u -r1.42.2.1 -r1.42.2.2 --- configure 15 Apr 2008 16:44:34 -0000 1.42.2.1 +++ configure 15 Apr 2008 16:47:30 -0000 1.42.2.2 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.3. +# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.4. # # Report bugs to <http://bugzilla.redhat.com/>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='dirsrv-admin' PACKAGE_TARNAME='dirsrv-admin' -PACKAGE_VERSION='1.1.3' -PACKAGE_STRING='dirsrv-admin 1.1.3' +PACKAGE_VERSION='1.1.4' +PACKAGE_STRING='dirsrv-admin 1.1.4' PACKAGE_BUGREPORT='http://bugzilla.redhat.com/' ac_unique_file="admserv/cgi-src40/viewlog.c" @@ -957,7 +957,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dirsrv-admin 1.1.3 to adapt to many kinds of systems. +\`configure' configures dirsrv-admin 1.1.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1023,7 +1023,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dirsrv-admin 1.1.3:";; + short | recursive ) echo "Configuration of dirsrv-admin 1.1.4:";; esac cat <<\_ACEOF @@ -1202,7 +1202,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -dirsrv-admin configure 1.1.3 +dirsrv-admin configure 1.1.4 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1216,7 +1216,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dirsrv-admin $as_me 1.1.3, which was +It was created by dirsrv-admin $as_me 1.1.4, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1860,7 +1860,7 @@ # Define the identity of the package. PACKAGE='dirsrv-admin' - VERSION='1.1.3' + VERSION='1.1.4' cat >>confdefs.h <<_ACEOF @@ -25613,7 +25613,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by dirsrv-admin $as_me 1.1.3, which was +This file was extended by dirsrv-admin $as_me 1.1.4, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25676,7 +25676,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -dirsrv-admin config.status 1.1.3 +dirsrv-admin config.status 1.1.4 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

1 0

[Fedora-directory-commits] adminserver configure, 1.42, 1.42.2.1 configure.ac, 1.24, 1.24.2.1 aclocal.m4, 1.38, 1.38.2.1 missing, 1.28, 1.28.2.1 install-sh, 1.28, 1.28.2.1 depcomp, 1.28, 1.28.2.1 compile, 1.27, 1.27.2.1 Makefile.in, 1.45, 1.45.2.1 config.sub, 1.28, 1.28.2.1 config.guess, 1.28, 1.28.2.1
by Doctor Conrad 15 Apr '08

15 Apr '08

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7894/adminserver Modified Files: Tag: Directory_Server_8_0_Branch configure configure.ac aclocal.m4 missing install-sh depcomp compile Makefile.in config.sub config.guess Log Message: Resolves: bugs 437301 and 437320 Description: Directory Server: shell command injection in CGI replication monitor Directory Server: unrestricted access to CGI scripts Fix Description: remove ScriptAlias for bin/admin/admin/bin - do not use that directory for CGI URIs - use only protected URIs for CGIs requiring authentication Remove most CGI parameters from repl-monitor-cgi.pl - user must supply replmon.conf in the admin server config directory instead of passing in this pathname - repl-monitor-cgi.pl does not use system to call repl-monitor.pl, it "includes" that script (using perl import). Platforms tested: all supported platforms Flag Day: no Doc impact: release notes are available Index: configure =================================================================== RCS file: /cvs/dirsec/adminserver/configure,v retrieving revision 1.42 retrieving revision 1.42.2.1 diff -u -r1.42 -r1.42.2.1 --- configure 18 Dec 2007 19:55:22 -0000 1.42 +++ configure 15 Apr 2008 16:44:34 -0000 1.42.2.1 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.1. +# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.3. # # Report bugs to <http://bugzilla.redhat.com/>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='dirsrv-admin' PACKAGE_TARNAME='dirsrv-admin' -PACKAGE_VERSION='1.1.1' -PACKAGE_STRING='dirsrv-admin 1.1.1' +PACKAGE_VERSION='1.1.3' +PACKAGE_STRING='dirsrv-admin 1.1.3' PACKAGE_BUGREPORT='http://bugzilla.redhat.com/' ac_unique_file="admserv/cgi-src40/viewlog.c" @@ -957,7 +957,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dirsrv-admin 1.1.1 to adapt to many kinds of systems. +\`configure' configures dirsrv-admin 1.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1023,7 +1023,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dirsrv-admin 1.1.1:";; + short | recursive ) echo "Configuration of dirsrv-admin 1.1.3:";; esac cat <<\_ACEOF @@ -1202,7 +1202,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -dirsrv-admin configure 1.1.1 +dirsrv-admin configure 1.1.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1216,7 +1216,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dirsrv-admin $as_me 1.1.1, which was +It was created by dirsrv-admin $as_me 1.1.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1860,7 +1860,7 @@ # Define the identity of the package. PACKAGE='dirsrv-admin' - VERSION='1.1.1' + VERSION='1.1.3' cat >>confdefs.h <<_ACEOF @@ -25613,7 +25613,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by dirsrv-admin $as_me 1.1.1, which was +This file was extended by dirsrv-admin $as_me 1.1.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25676,7 +25676,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -dirsrv-admin config.status 1.1.1 +dirsrv-admin config.status 1.1.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Index: configure.ac =================================================================== RCS file: /cvs/dirsec/adminserver/configure.ac,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -u -r1.24 -r1.24.2.1 --- configure.ac 18 Dec 2007 19:55:22 -0000 1.24 +++ configure.ac 15 Apr 2008 16:44:34 -0000 1.24.2.1 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dirsrv-admin], [1.1.1], [http://bugzilla.redhat.com/] +AC_INIT([dirsrv-admin], [1.1.3], [http://bugzilla.redhat.com/] AC_CONFIG_SRCDIR([admserv/cgi-src40/viewlog.c]) AM_INIT_AUTOMAKE([1.9 foreign subdir-objects]) AM_MAINTAINER_MODE

1 0

[Fedora-directory-commits] adminserver/admserv/cgi-src40 repl-monitor-cgi.pl.in, 1.1, 1.1.2.1
by Doctor Conrad 15 Apr '08

15 Apr '08

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cgi-src40 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7894/adminserver/admserv/cgi-src40 Modified Files: Tag: Directory_Server_8_0_Branch repl-monitor-cgi.pl.in Log Message: Resolves: bugs 437301 and 437320 Description: Directory Server: shell command injection in CGI replication monitor Directory Server: unrestricted access to CGI scripts Fix Description: remove ScriptAlias for bin/admin/admin/bin - do not use that directory for CGI URIs - use only protected URIs for CGIs requiring authentication Remove most CGI parameters from repl-monitor-cgi.pl - user must supply replmon.conf in the admin server config directory instead of passing in this pathname - repl-monitor-cgi.pl does not use system to call repl-monitor.pl, it "includes" that script (using perl import). Platforms tested: all supported platforms Flag Day: no Doc impact: release notes are available Index: repl-monitor-cgi.pl.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/repl-monitor-cgi.pl.in,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- repl-monitor-cgi.pl.in 5 Sep 2007 16:45:59 -0000 1.1 +++ repl-monitor-cgi.pl.in 15 Apr 2008 16:44:35 -0000 1.1.2.1 @@ -42,22 +42,25 @@ my $query = CGI->new; -$params = ""; -$params .= " -h " . $query->url_param('servhost') if $query->url_param('servhost'); -$params .= " -p " . $query->url_param('servport') if $query->url_param('servport'); -$params .= " -f " . $query->url_param('configfile') if $query->url_param('configfile'); -$params .= " -t " . $query->url_param('refreshinterval') if $query->url_param('refreshinterval'); -if ($query->url_param('admurl')) { - $admurl = $query->url_param('admurl'); - if ( $ENV{'QUERY_STRING'} ) { - $admurl .= "?$ENV{'QUERY_STRING'}"; - } - elsif ( $ENV{'CONTENT_LENGTH'} ) { - $admurl .= "?$CGI::CONTENT"; - } - $params .= " -u \"$admurl\""; +@ARGV = (); # clear it out +my $configfile; +if ($ENV{DS_CONFIG_DIR} and -d $ENV{DS_CONFIG_DIR}) { + $configfile = "$ENV{DS_CONFIG_DIR}/@instancename@/replmon.conf"; +} elsif ("@instconfigdir@" and -d "@instconfigdir@") { + $configfile = "@instconfigdir@/replmon.conf"; } +push @ARGV, '-f', $configfile; + +my $refreshinterval = $query->url_param('refreshinterval') ? int($query->url_param('refreshinterval')) : "300"; +push @ARGV, '-t', $refreshinterval; + +my $admurl = "http://"; +if ($ENV{HTTPS} and (lc($ENV{HTTPS}) eq "on")) { + $admurl = "https://"; +} +$admurl .= $ENV{HTTP_HOST} . $ENV{SCRIPT_NAME} . "?refreshinterval=$refreshinterval"; +push @ARGV, '-u', $admurl; + # Now the real work -$replmon = "@bindir@/repl-monitor.pl"; -system("$replmon $params"); +require "@bindir@/repl-monitor.pl";

1 0

[Fedora-directory-commits] adminserver/admserv/cfgstuff admserv.conf.in, 1.10, 1.10.2.1
by Doctor Conrad 15 Apr '08

15 Apr '08

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7894/adminserver/admserv/cfgstuff Modified Files: Tag: Directory_Server_8_0_Branch admserv.conf.in Log Message: Resolves: bugs 437301 and 437320 Description: Directory Server: shell command injection in CGI replication monitor Directory Server: unrestricted access to CGI scripts Fix Description: remove ScriptAlias for bin/admin/admin/bin - do not use that directory for CGI URIs - use only protected URIs for CGIs requiring authentication Remove most CGI parameters from repl-monitor-cgi.pl - user must supply replmon.conf in the admin server config directory instead of passing in this pathname - repl-monitor-cgi.pl does not use system to call repl-monitor.pl, it "includes" that script (using perl import). Platforms tested: all supported platforms Flag Day: no Doc impact: release notes are available Index: admserv.conf.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf.in,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -r1.10 -r1.10.2.1 --- admserv.conf.in 7 Dec 2007 17:43:50 -0000 1.10 +++ admserv.conf.in 15 Apr 2008 16:44:35 -0000 1.10.2.1 @@ -25,7 +25,6 @@ ADMServerVersionString "@capbrand@-Administrator/@PACKAGE_VERSION@" ADMConfigDir "@configdir@" -ScriptAlias /bin/admin/admin/bin/ "@cgibindir@/" ScriptAlias /dist/ "@cgibindir@/" ScriptAlias /manual/help/ "@cgibindir@/" @@ -63,7 +62,7 @@ # remap / requests to the download CGI RewriteEngine on -RewriteRule ^/$ /bin/admin/admin/bin/download [R,L,QSA] +RewriteRule ^/$ /dist/download [R,L,QSA] # remap admin server icons Alias /admin-serv/tasks/icons/ @icondir@/

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/plugins/memberof memberof.c, 1.5, 1.6
by Doctor Conrad 03 Apr '08

03 Apr '08

Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24511 Modified Files: memberof.c Log Message: Resolves: 440474 Summary: Fixed memory leaks in memberOf plug-in. Index: memberof.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof/memberof.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- memberof.c 3 Apr 2008 16:52:46 -0000 1.5 +++ memberof.c 3 Apr 2008 23:04:11 -0000 1.6 @@ -585,7 +585,7 @@ /* get the mod set */ slapi_pblock_get(pb, SLAPI_MODIFY_MODS, &mods); smods = slapi_mods_new(); - slapi_mods_init_passin(smods, mods); + slapi_mods_init_byref(smods, mods); next_mod = slapi_mod_new(); smod = slapi_mods_get_first_smod(smods, next_mod); @@ -653,6 +653,7 @@ } slapi_mod_free(&next_mod); + slapi_mods_free(&smods); } slapi_log_error( SLAPI_LOG_TRACE, MEMBEROF_PLUGIN_SUBSYSTEM, @@ -923,7 +924,7 @@ slapi_log_error( SLAPI_LOG_PLUGIN, MEMBEROF_PLUGIN_SUBSYSTEM, "memberof_modop_one_r: not processing memberOf " - "operations on self entry: %s\n", this_dn_val); + "operations on self entry: %s\n", this_dn_val); slapi_value_free(&to_dn_val); slapi_value_free(&this_dn_val); goto bail; @@ -1009,6 +1010,7 @@ } bail: + slapi_entry_free(e); return rc; } @@ -1307,6 +1309,7 @@ rc = 0 == slapi_attr_value_find( attr, slapi_value_get_berval(memberdn)); } + slapi_entry_free(group_e); } slapi_sdn_free(&sdn); @@ -1612,6 +1615,8 @@ } } } + slapi_ch_free((void **)&pre_array); + slapi_ch_free((void **)&post_array); } return 0; @@ -1825,6 +1830,8 @@ } bail: + slapi_entry_free(group_e); + slapi_entry_free(opto_e); slapi_ch_free_string(&filter_str); slapi_log_error( SLAPI_LOG_TRACE, MEMBEROF_PLUGIN_SUBSYSTEM,

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd detach.c, 1.6, 1.7 main.c, 1.23, 1.24 proto-slap.h, 1.31, 1.32
by Doctor Conrad 03 Apr '08

03 Apr '08

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2319/ldap/servers/slapd Modified Files: detach.c main.c proto-slap.h Log Message: Resolves: bug 439829 Bug Description: simple password auth fails using NSS 3.11.99 or later Reviewed by: nkinder (Thanks!) Fix Description: The new softokn in NSS 3.11.99 and later requires that the server calls NSS_Init() after forking, but before detaching from the controlling terminal. In fact, this was always a requirement, but the softokn in older NSS allow it. However, it's possible that some hardware crypto devices do not allow this and may not work with older directory servers. The fix is to move the nss/ssl initialization so that it can be called at the right point, or from other points in cases where the server does not fork (e.g. db2ldif). Platforms tested: Fedora 9 i386, RHEL5 x86_64 Flag Day: no Doc impact: no Index: detach.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/detach.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- detach.c 10 Nov 2006 23:45:40 -0000 1.6 +++ detach.c 3 Apr 2008 21:07:55 -0000 1.7 @@ -76,7 +76,8 @@ #endif /* USE_SYSCONF */ void -detach() +detach( int slapd_exemode, int importexport_encrypt, + int s_port, daemon_ports_t *ports_info ) { #ifndef _WIN32 int i, sd; @@ -108,6 +109,12 @@ break; } + /* call this right after the fork, but before closing stdin */ + if (slapd_do_all_nss_ssl_init(slapd_exemode, importexport_encrypt, + s_port, ports_info)) { + exit(1); + } + workingdir = config_get_workingdir(); if ( NULL == workingdir ) { errorlog = config_get_errorlog(); @@ -150,7 +157,12 @@ #endif /* USE_SETSID */ g_set_detached(1); - } + } else { /* not detaching - call nss/ssl init */ + if (slapd_do_all_nss_ssl_init(slapd_exemode, importexport_encrypt, + s_port, ports_info)) { + exit(1); + } + } (void) SIGNAL( SIGPIPE, SIG_IGN ); #endif /* _WIN32 */ Index: main.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- main.c 3 Apr 2008 16:52:46 -0000 1.23 +++ main.c 3 Apr 2008 21:07:55 -0000 1.24 @@ -901,48 +901,14 @@ } #endif - /* - * Initialise NSS once for the whole slapd process, whether SSL - * is enabled or not. We use NSS for random number generation and - * other things even if we are not going to accept SSL connections. - * We also need NSS for attribute encryption/decryption on import and export. - */ - init_ssl = ( (slapd_exemode == SLAPD_EXEMODE_SLAPD) || importexport_encrypt) - && config_get_security() - && (0 != s_port) && (s_port <= LDAP_PORT_MAX); - /* As of DS 6.1, always do a full initialization so that other - * modules can assume NSS is available - */ - if ( slapd_nss_init((slapd_exemode == SLAPD_EXEMODE_SLAPD), - (slapd_exemode != SLAPD_EXEMODE_REFERRAL) /* have config? */ )) { - LDAPDebug(LDAP_DEBUG_ANY, - "ERROR: NSS Initialization Failed.\n", 0, 0, 0); - exit (1); - } - - if (slapd_exemode == SLAPD_EXEMODE_SLAPD) { - client_auth_init(); - } - - if ( init_ssl && ( 0 != slapd_ssl_init())) { - LDAPDebug(LDAP_DEBUG_ANY, - "ERROR: SSL Initialization Failed.\n", 0, 0, 0 ); - exit( 1 ); - } - - if ((slapd_exemode == SLAPD_EXEMODE_SLAPD) || - (slapd_exemode == SLAPD_EXEMODE_REFERRAL)) { - if ( init_ssl ) { - PRFileDesc **sock; - for (sock = ports_info.s_socket; sock && *sock; sock++) { - if ( 0 != slapd_ssl_init2(sock, 0) ) { - LDAPDebug(LDAP_DEBUG_ANY, - "ERROR: SSL Initialization phase 2 Failed.\n", 0, 0, 0 ); - exit( 1 ); - } - } - } - } + /* Do NSS and/or SSL init for those modes other than listening modes */ + if ((slapd_exemode != SLAPD_EXEMODE_REFERRAL) && + (slapd_exemode != SLAPD_EXEMODE_SLAPD)) { + if (slapd_do_all_nss_ssl_init(slapd_exemode, importexport_encrypt, + s_port, &ports_info)) { + return 1; + } + } /* * if we were called upon to do special database stuff, do it and be @@ -1002,7 +968,8 @@ * Have to detach after ssl_init - the user may be prompted for the PIN * on the terminal, so it must be open. */ - detach(); + detach(slapd_exemode, importexport_encrypt, + s_port, &ports_info); /* * Now write our PID to the startup PID file. @@ -2885,3 +2852,67 @@ } #endif /* LDAP_DEBUG */ +/* + This function does all NSS and SSL related initialization + required during startup. We use this function rather + than just call this code from main because we must perform + all of this initialization after the fork() but before + we detach from the controlling terminal. This is because + the NSS softokn requires that NSS_Init is called after the + fork - this was always the case, but it is a hard error in + NSS 3.11.99 and later. We also have to call NSS_Init before + doing the detach because NSS may prompt the user for the + token (h/w or softokn) password on stdin. So we use this + function that we can call from detach() if running in + regular slapd exemode or from main() if running in other + modes (or just not detaching). +*/ +int +slapd_do_all_nss_ssl_init(int slapd_exemode, int importexport_encrypt, + int s_port, daemon_ports_t *ports_info) +{ + /* + * Initialise NSS once for the whole slapd process, whether SSL + * is enabled or not. We use NSS for random number generation and + * other things even if we are not going to accept SSL connections. + * We also need NSS for attribute encryption/decryption on import and export. + */ + int init_ssl = ( (slapd_exemode == SLAPD_EXEMODE_SLAPD) || importexport_encrypt) + && config_get_security() + && (0 != s_port) && (s_port <= LDAP_PORT_MAX); + /* As of DS 6.1, always do a full initialization so that other + * modules can assume NSS is available + */ + if ( slapd_nss_init((slapd_exemode == SLAPD_EXEMODE_SLAPD), + (slapd_exemode != SLAPD_EXEMODE_REFERRAL) /* have config? */ )) { + LDAPDebug(LDAP_DEBUG_ANY, + "ERROR: NSS Initialization Failed.\n", 0, 0, 0); + exit (1); + } + + if (slapd_exemode == SLAPD_EXEMODE_SLAPD) { + client_auth_init(); + } + + if ( init_ssl && ( 0 != slapd_ssl_init())) { + LDAPDebug(LDAP_DEBUG_ANY, + "ERROR: SSL Initialization Failed.\n", 0, 0, 0 ); + exit( 1 ); + } + + if ((slapd_exemode == SLAPD_EXEMODE_SLAPD) || + (slapd_exemode == SLAPD_EXEMODE_REFERRAL)) { + if ( init_ssl ) { + PRFileDesc **sock; + for (sock = ports_info->s_socket; sock && *sock; sock++) { + if ( 0 != slapd_ssl_init2(sock, 0) ) { + LDAPDebug(LDAP_DEBUG_ANY, + "ERROR: SSL Initialization phase 2 Failed.\n", 0, 0, 0 ); + exit( 1 ); + } + } + } + } + + return 0; +} Index: proto-slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- proto-slap.h 18 Oct 2007 01:22:29 -0000 1.31 +++ proto-slap.h 3 Apr 2008 21:07:55 -0000 1.32 @@ -483,7 +483,8 @@ /* * detach.c */ -void detach( void ); +void detach( int slapd_exemode, int importexport_encrypt, + int s_port, daemon_ports_t *ports_info ); #ifndef _WIN32 void close_all_files( void ); #endif @@ -879,7 +880,6 @@ int slapd_ssl_listener_is_initialized(); int sasl_io_cleanup(Connection *c); - /* * security_wrappers.c */ @@ -1277,4 +1277,7 @@ #if ( defined( hpux ) || defined( irix )) void signal2sigaction( int s, void *a ); #endif +int slapd_do_all_nss_ssl_init(int slapd_exemode, int importexport_encrypt, + int s_port, daemon_ports_t *ports_info); + #endif /* _PROTO_SLAP */

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd log.c, 1.21, 1.22
by Doctor Conrad 03 Apr '08

03 Apr '08

Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25728/slapd Modified Files: log.c Log Message: Resolves: 440333 Summary: Fixed valrgind errors about use of unitialized values. Index: log.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- log.c 3 Dec 2007 18:16:32 -0000 1.21 +++ log.c 3 Apr 2008 17:18:11 -0000 1.22 @@ -4007,7 +4007,7 @@ static time_t log_reverse_convert_time(char *tbuf) { - struct tm tm; + struct tm tm = {0}; if (strchr(tbuf, '-')) { /* short format */ strptime(tbuf, "%Y%m%d-%H%M%S", &tm);

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/plugins/acl acl_ext.c, 1.7, 1.8
by Doctor Conrad 03 Apr '08

03 Apr '08

Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/acl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25728/plugins/acl Modified Files: acl_ext.c Log Message: Resolves: 440333 Summary: Fixed valrgind errors about use of unitialized values. Index: acl_ext.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acl_ext.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- acl_ext.c 18 Oct 2007 00:08:27 -0000 1.7 +++ acl_ext.c 3 Apr 2008 17:18:10 -0000 1.8 @@ -647,7 +647,7 @@ struct acl_cblock *aclcb = NULL; char *authType; void *conn; - unsigned long op_type; + int op_type; if ( NULL == aclpb ) {

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins sampletask.c, 1.2, 1.3
by Doctor Conrad 03 Apr '08

03 Apr '08

Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18174/ldap/servers/slapd/test-plugins Modified Files: sampletask.c Log Message: Resolves: 439907 Summary: Enhanced SLAPI task API and ported existing tasks to use new API. Index: sampletask.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/sampletask.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sampletask.c 13 Aug 2007 15:35:35 -0000 1.2 +++ sampletask.c 3 Apr 2008 16:52:47 -0000 1.3 @@ -47,7 +47,7 @@ * objectClass: nsSlapdPlugin * objectClass: extensibleObject * cn: sampletask - * nsslapd-pluginPath: <prefix>/usr/lib/<PACKAGE_NAME>/plugins/libsampletask-plugin.so + * nsslapd-pluginPath: libsampletask-plugin * nsslapd-pluginInitfunc: sampletask_init * nsslapd-pluginType: object * nsslapd-pluginEnabled: on @@ -58,26 +58,26 @@ * * 4. create a config task entry in dse.ldif * Task entry: - * dn: cn=sample task, cn=tasks, cn=config + * dn: cn=sampletask, cn=tasks, cn=config * objectClass: top * objectClass: extensibleObject - * cn: sample task + * cn: sampletask * * 5. to invoke the sample task, run the command line: * $ ./ldapmodify -h <host> -p <port> -D "cn=Directory Manager" -w <pw> -a - * dn: cn=sample task 0, cn=sample task, cn=tasks, cn=config + * dn: cn=sampletask 0, cn=sample task, cn=tasks, cn=config * objectClass: top * objectClass: extensibleObject * cn: sample task 0 - * arg0: sample task arg0 + * myarg: sample task myarg * * Result is in the errors log - * [...] - Sample task starts (arg: sample task arg0) ... + * [...] - Sample task starts (arg: sample task myarg) ... * [...] - Sample task finished. */ -#include "slap.h" -#include "slapi-private.h" +#include "slapi-plugin.h" +#include "nspr.h" static int task_sampletask_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, char *returntext, @@ -118,33 +118,32 @@ static void task_sampletask_thread(void *arg) { - Slapi_PBlock *pb = (Slapi_PBlock *)arg; - Slapi_Task *task = pb->pb_task; - int rv; - - task->task_work = 1; - task->task_progress = 0; - task->task_state = SLAPI_TASK_RUNNING; - slapi_task_status_changed(task); - - slapi_task_log_notice(task, "Sample task starts (arg: %s) ...\n", - pb->pb_seq_val); - LDAPDebug(LDAP_DEBUG_ANY, "Sample task starts (arg: %s) ...\n", - pb->pb_seq_val, 0, 0); - /* do real work */ - rv = 0; + Slapi_Task *task = (Slapi_Task *)arg; + char *myarg = NULL; + int i, rv = 0; + int total_work = 3; + + /* fetch our argument from the task */ + myarg = (char *)slapi_task_get_data(task); + + /* update task state to show it's running */ + slapi_task_begin(task, total_work); + slapi_task_log_notice(task, "Sample task starts (arg: %s) ...\n", myarg); + slapi_log_error(SLAPI_LOG_FATAL, "sampletask", "Sample task starts (arg: %s) ...\n", myarg); + + /* real work would be done here */ + for (i = 0; i < total_work; i++) { + PR_Sleep(10000); + slapi_task_inc_progress(task); + } + /* update task state to say we're finished */ slapi_task_log_notice(task, "Sample task finished."); slapi_task_log_status(task, "Sample task finished."); - LDAPDebug(LDAP_DEBUG_ANY, "Sample task finished.\n", 0, 0, 0); - - task->task_progress = 1; - task->task_exitcode = rv; - task->task_state = SLAPI_TASK_FINISHED; - slapi_task_status_changed(task); + slapi_log_error(SLAPI_LOG_FATAL, "sampletask", "Sample task finished.\n"); - slapi_ch_free((void **)&pb->pb_seq_val); - slapi_pblock_destroy(pb); + /* this will queue the destruction of the task */ + slapi_task_finish(task, rv); } /* extract a single value from the entry (as a string) -- if it's not in the @@ -163,6 +162,17 @@ return slapi_value_get_string(val); } +static void +task_sampletask_destructor(Slapi_Task *task) +{ + if (task) { + char *myarg = (char *)slapi_task_get_data(task); + if (myarg) { + slapi_ch_free_string(&myarg); + } + } +} + /* * Invoked when the task instance is added by the client (step 5 of the comment) * Get the necessary attributes from the task entry, and spawns a thread to do @@ -178,7 +188,7 @@ int rv = SLAPI_DSE_CALLBACK_OK; Slapi_PBlock *mypb = NULL; Slapi_Task *task = NULL; - const char *arg0; + const char *myarg; *returncode = LDAP_SUCCESS; if ((cn = fetch_attr(e, "cn", NULL)) == NULL) { @@ -188,7 +198,7 @@ } /* get arg(s) */ - if ((arg0 = fetch_attr(e, "arg0", NULL)) == NULL) { + if ((myarg = fetch_attr(e, "myarg", NULL)) == NULL) { *returncode = LDAP_OBJECT_CLASS_VIOLATION; rv = SLAPI_DSE_CALLBACK_ERROR; goto out; @@ -197,46 +207,33 @@ /* allocate new task now */ task = slapi_new_task(slapi_entry_get_ndn(e)); if (task == NULL) { - LDAPDebug(LDAP_DEBUG_ANY, "unable to allocate new task!\n", 0, 0, 0); - *returncode = LDAP_OPERATIONS_ERROR; - rv = SLAPI_DSE_CALLBACK_ERROR; - goto out; - } - task->task_state = SLAPI_TASK_SETUP; - task->task_work = 1; - task->task_progress = 0; - - /* create a pblock to pass the necessary info to the task thread */ - mypb = slapi_pblock_new(); - if (mypb == NULL) { + slapi_log_error(SLAPI_LOG_FATAL, "sampletask", "unable to allocate new task!\n"); *returncode = LDAP_OPERATIONS_ERROR; rv = SLAPI_DSE_CALLBACK_ERROR; goto out; } - mypb->pb_seq_val = slapi_ch_strdup(arg0); - mypb->pb_task = task; - mypb->pb_task_flags = TASK_RUNNING_AS_TASK; + + /* set a destructor that will clean up myarg for us when the task is complete */ + slapi_task_set_destructor_fn(task, task_sampletask_destructor); + + /* Stash our argument in the task for use by the task thread */ + slapi_task_set_data(task, slapi_ch_strdup(myarg)); /* start the sample task as a separate thread */ thread = PR_CreateThread(PR_USER_THREAD, task_sampletask_thread, - (void *)mypb, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, + (void *)task, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE); if (thread == NULL) { - LDAPDebug(LDAP_DEBUG_ANY, - "unable to create sample task thread!\n", 0, 0, 0); + slapi_log_error(SLAPI_LOG_FATAL, "sampletask", + "unable to create sample task thread!\n"); *returncode = LDAP_OPERATIONS_ERROR; rv = SLAPI_DSE_CALLBACK_ERROR; - slapi_ch_free((void **)&mypb->pb_seq_val); - slapi_pblock_destroy(mypb); - goto out; + slapi_task_finish(task, *returncode); + } else { + /* thread successful */ + rv = SLAPI_DSE_CALLBACK_OK; } - /* thread successful -- don't free the pb, let the thread do that. */ - return SLAPI_DSE_CALLBACK_OK; - out: - if (task) { - slapi_destroy_task(task); - } return rv; }

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd main.c, 1.22, 1.23 slap.h, 1.30, 1.31 slapi-plugin.h, 1.19, 1.20 slapi-private.h, 1.20, 1.21 task.c, 1.14, 1.15
by Doctor Conrad 03 Apr '08

03 Apr '08

Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18174/ldap/servers/slapd Modified Files: main.c slap.h slapi-plugin.h slapi-private.h task.c Log Message: Resolves: 439907 Summary: Enhanced SLAPI task API and ported existing tasks to use new API. Index: main.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- main.c 18 Oct 2007 00:08:34 -0000 1.22 +++ main.c 3 Apr 2008 16:52:46 -0000 1.23 @@ -2118,7 +2118,7 @@ pb.pb_ldif_files = ldif_file; pb.pb_ldif_include = db2ldif_include; pb.pb_ldif_exclude = db2ldif_exclude; - pb.pb_task_flags = TASK_RUNNING_FROM_COMMANDLINE; + pb.pb_task_flags = SLAPI_TASK_RUNNING_FROM_COMMANDLINE; #ifndef _WIN32 main_setuid(slapdFrontendConfig->localuser); #endif @@ -2245,7 +2245,7 @@ pb.pb_ldif_dump_uniqueid = db2ldif_dump_uniqueid; pb.pb_ldif_encrypt = importexport_encrypt; pb.pb_instance_name = *instp; - pb.pb_task_flags = TASK_RUNNING_FROM_COMMANDLINE; + pb.pb_task_flags = SLAPI_TASK_RUNNING_FROM_COMMANDLINE; if (is_slapd_running()) pb.pb_server_running = 1; else @@ -2431,7 +2431,7 @@ pb.pb_plugin = plugin; pb.pb_db2index_attrs = db2index_attrs; pb.pb_instance_name = cmd_line_instance_name; - pb.pb_task_flags = TASK_RUNNING_FROM_COMMANDLINE; + pb.pb_task_flags = SLAPI_TASK_RUNNING_FROM_COMMANDLINE; #ifndef _WIN32 main_setuid(slapdFrontendConfig->localuser); #endif @@ -2489,7 +2489,7 @@ pb.pb_plugin = backend_plugin; pb.pb_instance_name = cmd_line_instance_name; pb.pb_seq_val = archive_name; - pb.pb_task_flags = TASK_RUNNING_FROM_COMMANDLINE; + pb.pb_task_flags = SLAPI_TASK_RUNNING_FROM_COMMANDLINE; #ifndef _WIN32 main_setuid(slapdFrontendConfig->localuser); #endif @@ -2539,7 +2539,7 @@ pb.pb_plugin = backend_plugin; pb.pb_instance_name = cmd_line_instance_name; pb.pb_seq_val = archive_name; - pb.pb_task_flags = TASK_RUNNING_FROM_COMMANDLINE; + pb.pb_task_flags = SLAPI_TASK_RUNNING_FROM_COMMANDLINE; #ifndef _WIN32 main_setuid(slapdFrontendConfig->localuser); #endif @@ -2601,7 +2601,7 @@ pb.pb_plugin = backend_plugin; pb.pb_seq_val = archive_name; pb.pb_seq_type = upgradedb_force; - pb.pb_task_flags = TASK_RUNNING_FROM_COMMANDLINE; + pb.pb_task_flags = SLAPI_TASK_RUNNING_FROM_COMMANDLINE; /* borrowing import code, so need to set up the import variables */ pb.pb_ldif_generate_uniqueid = ldif2db_generate_uniqueid; pb.pb_ldif_namespaceid = ldif2db_namespaceid; @@ -2656,7 +2656,7 @@ pb.pb_seq_type = dbverify_verbose; pb.pb_plugin = backend_plugin; pb.pb_instance_name = (char *)cmd_line_instance_names; - pb.pb_task_flags = TASK_RUNNING_FROM_COMMANDLINE; + pb.pb_task_flags = SLAPI_TASK_RUNNING_FROM_COMMANDLINE; if ( backend_plugin->plg_dbverify != NULL ) { return_value = (*backend_plugin->plg_dbverify)( &pb ); Index: slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- slap.h 18 Oct 2007 01:22:29 -0000 1.30 +++ slap.h 3 Apr 2008 16:52:46 -0000 1.31 @@ -1283,6 +1283,27 @@ #define SLAPD_POLL_FLAGS (PR_POLL_READ) #endif +/****************************************************************************** + * * Online tasks interface (to support import, export, etc) + * * After some cleanup, we could consider making these public. + * */ +struct slapi_task { + struct slapi_task *next; + char *task_dn; + int task_exitcode; /* for the end user */ + int task_state; /* current state of task */ + int task_progress; /* number between 0 and task_work */ + int task_work; /* "units" of work to be done */ + int task_flags; /* (see above) */ + char *task_status; /* transient status info */ + char *task_log; /* appended warnings, etc */ + void *task_private; /* allow opaque data to be stashed in the task */ + TaskCallbackFn cancel; /* task has been cancelled by user */ + TaskCallbackFn destructor; /* task entry is being destroyed */ + int task_refcount; +} slapi_task; +/* End of interface to support online tasks **********************************/ + typedef struct slapi_pblock { /* common */ Slapi_Backend *pb_backend; @@ -2016,10 +2037,6 @@ #include "intrinsics.h" -/* task flag (pb_task_flags)*/ -#define TASK_RUNNING_AS_TASK 0x0 -#define TASK_RUNNING_FROM_COMMANDLINE 0x1 - /* printkey: import & export */ #define EXPORT_PRINTKEY 0x1 #define EXPORT_NOWRAP 0x2 Index: slapi-plugin.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-plugin.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- slapi-plugin.h 5 Oct 2007 23:31:07 -0000 1.19 +++ slapi-plugin.h 3 Apr 2008 16:52:46 -0000 1.20 @@ -149,9 +149,10 @@ typedef struct slapi_mod Slapi_Mod; typedef struct slapi_mods Slapi_Mods; typedef struct slapi_componentid Slapi_ComponentId; + /* Online tasks interface (to support import, export, etc) */ -typedef struct _slapi_task Slapi_Task; -typedef int (*TaskCallbackFn)(Slapi_Task *task); +typedef struct slapi_task Slapi_Task; +typedef void (*TaskCallbackFn)(Slapi_Task *task); /* * The default thread stacksize for nspr21 is 64k (except on IRIX! It's 32k!). @@ -1206,6 +1207,22 @@ typedef int (*dseCallbackFn)(Slapi_PBlock *, Slapi_Entry *, Slapi_Entry *, int *, char*, void *); +/* + * Note: DSE callback functions MUST return one of these three values: + * + * SLAPI_DSE_CALLBACK_OK -- no errors occurred; apply changes. + * SLAPI_DSE_CALLBACK_ERROR -- an error occurred; don't apply changes. + * SLAPI_DSE_CALLBACK_DO_NOT_APPLY -- no error, but do not apply changes. + * + * SLAPI_DSE_CALLBACK_DO_NOT_APPLY should only be returned by modify + * callbacks (i.e., those registered with operation==SLAPI_OPERATION_MODIFY). + * A return value of SLAPI_DSE_CALLBACK_DO_NOT_APPLY is treated the same as + * SLAPI_DSE_CALLBACK_ERROR for all other operations. + */ +#define SLAPI_DSE_CALLBACK_OK (1) +#define SLAPI_DSE_CALLBACK_ERROR (-1) +#define SLAPI_DSE_CALLBACK_DO_NOT_APPLY (0) + /****************************************************************************** * Online tasks interface (to support import, export, etc) * After some cleanup, we could consider making these public. @@ -1217,10 +1234,26 @@ #define SLAPI_TASK_FINISHED 2 #define SLAPI_TASK_CANCELLED 3 +/* task flag (pb_task_flags)*/ +#define SLAPI_TASK_RUNNING_AS_TASK 0x0 +#define SLAPI_TASK_RUNNING_FROM_COMMANDLINE 0x1 + /* task flags (set by the task-control code) */ #define SLAPI_TASK_DESTROYING 0x01 /* queued event for destruction */ int slapi_task_register_handler(const char *name, dseCallbackFn func); +void slapi_task_begin(Slapi_Task *task, int total_work); +void slapi_task_inc_progress(Slapi_Task *task); +void slapi_task_finish(Slapi_Task *task, int rc); +void slapi_task_cancel(Slapi_Task *task, int rc); +int slapi_task_get_state(Slapi_Task *task); +void slapi_task_set_data(Slapi_Task *task, void *data); +void * slapi_task_get_data(Slapi_Task *task); +void slapi_task_inc_refcount(Slapi_Task *task); +void slapi_task_dec_refcount(Slapi_Task *task); +int slapi_task_get_refcount(Slapi_Task *task); +void slapi_task_set_destructor_fn(Slapi_Task *task, TaskCallbackFn func); +void slapi_task_set_cancel_fn(Slapi_Task *task, TaskCallbackFn func); void slapi_task_status_changed(Slapi_Task *task); void slapi_task_log_status(Slapi_Task *task, char *format, ...) #ifdef __GNUC__ Index: slapi-private.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-private.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- slapi-private.h 18 Oct 2007 22:40:18 -0000 1.20 +++ slapi-private.h 3 Apr 2008 16:52:46 -0000 1.21 @@ -1060,22 +1060,6 @@ */ /* - * Note: DSE callback functions MUST return one of these three values: - * - * SLAPI_DSE_CALLBACK_OK -- no errors occurred; apply changes. - * SLAPI_DSE_CALLBACK_ERROR -- an error occurred; don't apply changes. - * SLAPI_DSE_CALLBACK_DO_NOT_APPLY -- no error, but do not apply changes. - * - * SLAPI_DSE_CALLBACK_DO_NOT_APPLY should only be returned by modify - * callbacks (i.e., those registered with operation==SLAPI_OPERATION_MODIFY). - * A return value of SLAPI_DSE_CALLBACK_DO_NOT_APPLY is treated the same as - * SLAPI_DSE_CALLBACK_ERROR for all other operations. - */ -#define SLAPI_DSE_CALLBACK_OK (1) -#define SLAPI_DSE_CALLBACK_ERROR (-1) -#define SLAPI_DSE_CALLBACK_DO_NOT_APPLY (0) - -/* * Flags for slapi_config_register_callback() and * slapi_config_remove_callback() */ @@ -1198,30 +1182,6 @@ /***** End of items added for the replication plugin. ***********************/ -/****************************************************************************** - * Online tasks interface (to support import, export, etc) - * After some cleanup, we could consider making these public. - */ -struct _slapi_task { - struct _slapi_task *next; - char *task_dn; - int task_exitcode; /* for the end user */ - int task_state; /* (see above) */ - int task_progress; /* number between 0 and task_work */ - int task_work; /* "units" of work to be done */ - int task_flags; /* (see above) */ - - /* it is the task's responsibility to allocate this memory & free it: */ - char *task_status; /* transient status info */ - char *task_log; /* appended warnings, etc */ - - void *task_private; /* for use by backends */ - TaskCallbackFn cancel; /* task has been cancelled by user */ - TaskCallbackFn destructor; /* task entry is being destroyed */ - int task_refcount; -}; -/* End of interface to support online tasks **********************************/ - void DS_Sleep(PRIntervalTime ticks); /* macro to specify the behavior of upgradedb */ Index: task.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/task.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- task.c 18 Oct 2007 00:08:34 -0000 1.14 +++ task.c 3 Apr 2008 16:52:46 -0000 1.15 @@ -47,6 +47,9 @@ #include "slap.h" +/*********************************** + * Static Global Variables + ***********************************/ /* don't panic, this is only used when creating new tasks or removing old * ones... */ @@ -54,7 +57,9 @@ static PRLock *global_task_lock = NULL; static int shutting_down = 0; - +/*********************************** + * Private Defines + ***********************************/ #define TASK_BASE_DN "cn=tasks, cn=config" #define TASK_IMPORT_DN "cn=import, cn=tasks, cn=config" #define TASK_EXPORT_DN "cn=export, cn=tasks, cn=config" @@ -71,13 +76,398 @@ #define DEFAULT_TTL "120" /* seconds */ +#define LOG_BUFFER 256 +/* if the cumul. log gets larger than this, it's truncated: */ +#define MAX_SCROLLBACK_BUFFER 8192 + +#define NEXTMOD(_type, _val) do { \ + modlist[cur].mod_op = LDAP_MOD_REPLACE; \ + modlist[cur].mod_type = (_type); \ + modlist[cur].mod_values = (char **)slapi_ch_malloc(2*sizeof(char *)); \ + modlist[cur].mod_values[0] = (_val); \ + modlist[cur].mod_values[1] = NULL; \ + mod[cur] = &modlist[cur]; \ + cur++; \ +} while (0) + +/*********************************** + * Static Function Prototypes + ***********************************/ +static Slapi_Task *new_task(const char *dn); +static void destroy_task(time_t when, void *arg); static int task_modify(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, char *returntext, void *arg); static int task_deny(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, char *returntext, void *arg); -static int task_generic_destructor(Slapi_Task *task); +static void task_generic_destructor(Slapi_Task *task); +static const char *fetch_attr(Slapi_Entry *e, const char *attrname, + const char *default_val); +static Slapi_Entry *get_internal_entry(Slapi_PBlock *pb, char *dn); +static void modify_internal_entry(char *dn, LDAPMod **mods); + +/*********************************** + * Public Functions + ***********************************/ +/* + * slapi_new_task: create a new task, fill in DN, and setup modify callback + * argument: + * dn: task dn + * result: + * Success: Slapi_Task object + * Failure: NULL + */ +Slapi_Task * +slapi_new_task(const char *dn) +{ + return new_task(dn); +} + +/* slapi_destroy_task: destroy a task + * argument: + * task: task to destroy + * result: + * none + */ +void +slapi_destroy_task(void *arg) +{ + if (arg) { + destroy_task(1, arg); + } +} + +/* + * Sets the initial task state and updated status + */ +void slapi_task_begin(Slapi_Task *task, int total_work) +{ + if (task) { + task->task_work = total_work; + task->task_progress = 0; + task->task_state = SLAPI_TASK_RUNNING; + slapi_task_status_changed(task); + } +} + +/* + * Increments task progress and updates status + */ +void slapi_task_inc_progress(Slapi_Task *task) +{ + if (task) { + task->task_progress++; + slapi_task_status_changed(task); + } +} + +/* + * Sets completed task state and updates status + */ +void slapi_task_finish(Slapi_Task *task, int rc) +{ + if (task) { + task->task_exitcode = rc; + task->task_state = SLAPI_TASK_FINISHED; + slapi_task_status_changed(task); + } +} + +/* + * Cancels a task + */ +void slapi_task_cancel(Slapi_Task *task, int rc) +{ + if (task) { + task->task_exitcode = rc; + task->task_state = SLAPI_TASK_CANCELLED; + slapi_task_status_changed(task); + } +} + +/* + * Get the current state of a task + */ +int slapi_task_get_state(Slapi_Task *task) +{ + if (task) { + return task->task_state; + } +} +/* this changes the 'nsTaskStatus' value, which is transient (anything logged + * here wipes out any previous status) + */ +void slapi_task_log_status(Slapi_Task *task, char *format, ...) +{ + va_list ap; + + if (! task->task_status) + task->task_status = (char *)slapi_ch_malloc(10 * LOG_BUFFER); + if (! task->task_status) + return; /* out of memory? */ + + va_start(ap, format); + PR_vsnprintf(task->task_status, (10 * LOG_BUFFER), format, ap); + va_end(ap); + slapi_task_status_changed(task); +} + +/* this adds a line to the 'nsTaskLog' value, which is cumulative (anything + * logged here is added to the end) + */ +void slapi_task_log_notice(Slapi_Task *task, char *format, ...) +{ + va_list ap; + char buffer[LOG_BUFFER]; + size_t len; + + va_start(ap, format); + PR_vsnprintf(buffer, LOG_BUFFER, format, ap); + va_end(ap); + + len = 2 + strlen(buffer) + (task->task_log ? strlen(task->task_log) : 0); + if ((len > MAX_SCROLLBACK_BUFFER) && task->task_log) { + size_t i; + char *newbuf; + + /* start from middle of buffer, and find next linefeed */ + i = strlen(task->task_log)/2; + while (task->task_log[i] && (task->task_log[i] != '\n')) + i++; + if (task->task_log[i]) + i++; + len = strlen(task->task_log) - i + 2 + strlen(buffer); + newbuf = (char *)slapi_ch_malloc(len); + if (! newbuf) + return; /* out of memory? */ + strcpy(newbuf, task->task_log + i); + slapi_ch_free((void **)&task->task_log); + task->task_log = newbuf; + } else { + if (! task->task_log) { + task->task_log = (char *)slapi_ch_malloc(len); + task->task_log[0] = 0; + } else { + task->task_log = (char *)slapi_ch_realloc(task->task_log, len); + } + if (! task->task_log) + return; /* out of memory? */ + } + + if (task->task_log[0]) + strcat(task->task_log, "\n"); + strcat(task->task_log, buffer); + + slapi_task_status_changed(task); +} + +/* update attributes in the entry under "cn=tasks" to match the current + * status of the task. */ +void slapi_task_status_changed(Slapi_Task *task) +{ + LDAPMod modlist[20]; + LDAPMod *mod[20]; + int cur = 0, i; + char s1[20], s2[20], s3[20]; + + if (shutting_down) { + /* don't care about task status updates anymore */ + return; + } + + NEXTMOD(TASK_LOG_NAME, task->task_log); + NEXTMOD(TASK_STATUS_NAME, task->task_status); + sprintf(s1, "%d", task->task_exitcode); + sprintf(s2, "%d", task->task_progress); + sprintf(s3, "%d", task->task_work); + NEXTMOD(TASK_PROGRESS_NAME, s2); + NEXTMOD(TASK_WORK_NAME, s3); + /* only add the exit code when the job is done */ + if ((task->task_state == SLAPI_TASK_FINISHED) || + (task->task_state == SLAPI_TASK_CANCELLED)) { + NEXTMOD(TASK_EXITCODE_NAME, s1); + /* make sure the console can tell the task has ended */ + if (task->task_progress != task->task_work) { + task->task_progress = task->task_work; + } + } + + mod[cur] = NULL; + modify_internal_entry(task->task_dn, mod); + + for (i = 0; i < cur; i++) + slapi_ch_free((void **)&modlist[i].mod_values); + + if (((task->task_state == SLAPI_TASK_FINISHED) || + (task->task_state == SLAPI_TASK_CANCELLED)) && + !(task->task_flags & SLAPI_TASK_DESTROYING)) { + Slapi_PBlock *pb = slapi_pblock_new(); + Slapi_Entry *e; + int ttl; + time_t expire; + + e = get_internal_entry(pb, task->task_dn); + if (e == NULL) + return; + ttl = atoi(fetch_attr(e, "ttl", DEFAULT_TTL)); + if (ttl > 3600) + ttl = 3600; /* be reasonable. */ + expire = time(NULL) + ttl; + task->task_flags |= SLAPI_TASK_DESTROYING; + /* queue an event to destroy the state info */ + slapi_eq_once(destroy_task, (void *)task, expire); + + slapi_free_search_results_internal(pb); + slapi_pblock_destroy(pb); + } +} + +/* + * Stash some opaque task specific data in the task for later use. + */ +void slapi_task_set_data(Slapi_Task *task, void *data) +{ + if (task) { + task->task_private = data; + } +} + +/* + * Retrieve some opaque task specific data from the task. + */ +void * slapi_task_get_data(Slapi_Task *task) +{ + if (task) { + return task->task_private; + } +} + +/* + * Increment the task reference count + */ +void slapi_task_inc_refcount(Slapi_Task *task) +{ + if (task) { + task->task_refcount++; + } +} + +/* + * Decrement the task reference count + */ +void slapi_task_dec_refcount(Slapi_Task *task) +{ + if (task) { + task->task_refcount--; + } +} + +/* + * Returns the task reference count + */ +int slapi_task_get_refcount(Slapi_Task *task) +{ + if (task) { + return task->task_refcount; + } +} + +/* name is, for example, "import" */ +int slapi_task_register_handler(const char *name, dseCallbackFn func) +{ + char *dn = NULL; + Slapi_PBlock *pb = NULL; + Slapi_Operation *op; + LDAPMod *mods[3]; + LDAPMod mod[3]; + const char *objectclass[3]; + const char *cnvals[2]; + int ret = -1; + int x; + + dn = slapi_ch_smprintf("cn=%s, %s", name, TASK_BASE_DN); + if (dn == NULL) { + goto out; + } + + pb = slapi_pblock_new(); + if (pb == NULL) { + goto out; + } + + /* this is painful :( */ + mods[0] = &mod[0]; + mod[0].mod_op = LDAP_MOD_ADD; + mod[0].mod_type = "objectClass"; + mod[0].mod_values = (char **)objectclass; + objectclass[0] = "top"; + objectclass[1] = "extensibleObject"; + objectclass[2] = NULL; + mods[1] = &mod[1]; + mod[1].mod_op = LDAP_MOD_ADD; + mod[1].mod_type = "cn"; + mod[1].mod_values = (char **)cnvals; + cnvals[0] = name; + cnvals[1] = NULL; + mods[2] = NULL; + slapi_add_internal_set_pb(pb, dn, mods, NULL, + plugin_get_default_component_id(), 0); + x = 1; + slapi_pblock_set(pb, SLAPI_DSE_DONT_WRITE_WHEN_ADDING, &x); + /* Make sure these adds don't appear in the audit and change logs */ + slapi_pblock_get(pb, SLAPI_OPERATION, &op); + operation_set_flag(op, OP_FLAG_ACTION_NOLOG); + + slapi_add_internal_pb(pb); + slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &x); + if ((x != LDAP_SUCCESS) && (x != LDAP_ALREADY_EXISTS)) { + LDAPDebug(LDAP_DEBUG_ANY, + "Can't create task node '%s' (error %d)\n", + name, x, 0); + ret = x; + goto out; + } + + /* register add callback */ + slapi_config_register_callback(SLAPI_OPERATION_ADD, DSE_FLAG_PREOP, + dn, LDAP_SCOPE_SUBTREE, "(objectclass=*)", func, NULL); + /* deny modify/delete of the root task entry */ + slapi_config_register_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_PREOP, + dn, LDAP_SCOPE_BASE, "(objectclass=*)", task_deny, NULL); + slapi_config_register_callback(SLAPI_OPERATION_DELETE, DSE_FLAG_PREOP, + dn, LDAP_SCOPE_BASE, "(objectclass=*)", task_deny, NULL); + + ret = 0; + +out: + if (dn) { + slapi_ch_free((void **)&dn); + } + if (pb) { + slapi_pblock_destroy(pb); + } + return ret; +} + +void slapi_task_set_destructor_fn(Slapi_Task *task, TaskCallbackFn func) +{ + if (task) { + task->destructor = func; + } +} + +void slapi_task_set_cancel_fn(Slapi_Task *task, TaskCallbackFn func) +{ + if (task) { + task->cancel = func; + } +} + + +/*********************************** + * Static Helper Functions + ***********************************/ /* create a new task, fill in DN, and setup modify callback */ static Slapi_Task * new_task(const char *dn) @@ -92,7 +482,11 @@ PR_Unlock(global_task_lock); task->task_dn = slapi_ch_strdup(dn); - task->destructor = task_generic_destructor; + task->task_state = SLAPI_TASK_SETUP; + task->task_flags = SLAPI_TASK_RUNNING_AS_TASK; + task->destructor = NULL; + task->cancel = NULL; + task->task_private = NULL; slapi_config_register_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_PREOP, dn, LDAP_SCOPE_BASE, "(objectclass=*)", task_modify, (void *)task); slapi_config_register_callback(SLAPI_OPERATION_DELETE, DSE_FLAG_PREOP, dn, @@ -100,8 +494,8 @@ /* don't add entries under this one */ #if 0 /* don't know why, but this doesn't work. it makes the current add - * operation fail. :( - */ + * * operation fail. :( + * */ slapi_config_register_callback(SLAPI_OPERATION_ADD, DSE_FLAG_PREOP, dn, LDAP_SCOPE_SUBTREE, "(objectclass=*)", task_deny, NULL); #endif @@ -117,8 +511,13 @@ Slapi_Task *t1; Slapi_PBlock *pb = slapi_pblock_new(); - if (task->destructor != NULL) + /* Call the custom destructor callback if one was provided, + * then perform the internal task destruction. */ + if (task->destructor != NULL) { (*task->destructor)(task); + } + + task_generic_destructor(task); /* if when == 0, we're already locked (called during shutdown) */ if (when != 0) { @@ -141,45 +540,16 @@ slapi_config_remove_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_PREOP, task->task_dn, LDAP_SCOPE_BASE, "(objectclass=*)", task_modify); slapi_config_remove_callback(SLAPI_OPERATION_DELETE, DSE_FLAG_PREOP, - task->task_dn, LDAP_SCOPE_BASE, "(objectclass=*)", task_deny); - slapi_delete_internal_set_pb(pb, task->task_dn, NULL, NULL, - (void *)plugin_get_default_component_id(), 0); - - slapi_delete_internal_pb(pb); - slapi_pblock_destroy(pb); - - slapi_ch_free((void **)&task->task_dn); - slapi_ch_free((void **)&task); -} - -/* - * slapi_new_task: create a new task, fill in DN, and setup modify callback - * argument: - * dn: task dn - * result: - * Success: Slapi_Task object - * Failure: NULL - */ -Slapi_Task * -slapi_new_task(const char *dn) -{ - return new_task(dn); -} - -/* slapi_destroy_task: destroy a task - * argument: - * task: task to destroy - * result: - * none - */ -void -slapi_destroy_task(void *arg) -{ - destroy_task(1, arg); -} + task->task_dn, LDAP_SCOPE_BASE, "(objectclass=*)", task_deny); + slapi_delete_internal_set_pb(pb, task->task_dn, NULL, NULL, + (void *)plugin_get_default_component_id(), 0); -/********** some useful helper functions **********/ + slapi_delete_internal_pb(pb); + slapi_pblock_destroy(pb); + slapi_ch_free((void **)&task->task_dn); + slapi_ch_free((void **)&task); +} /* extract a single value from the entry (as a string) -- if it's not in the * entry, the default will be returned (which can be NULL). @@ -268,81 +638,7 @@ } while (ret != LDAP_SUCCESS); } - -/********** helper functions for dealing with task logging **********/ - -#define LOG_BUFFER 256 -/* if the cumul. log gets larger than this, it's truncated: */ -#define MAX_SCROLLBACK_BUFFER 8192 - -/* this changes the 'nsTaskStatus' value, which is transient (anything logged - * here wipes out any previous status) - */ -void slapi_task_log_status(Slapi_Task *task, char *format, ...) -{ - va_list ap; - - if (! task->task_status) - task->task_status = (char *)slapi_ch_malloc(10 * LOG_BUFFER); - if (! task->task_status) - return; /* out of memory? */ - - va_start(ap, format); - PR_vsnprintf(task->task_status, (10 * LOG_BUFFER), format, ap); - va_end(ap); - slapi_task_status_changed(task); -} - -/* this adds a line to the 'nsTaskLog' value, which is cumulative (anything - * logged here is added to the end) - */ -void slapi_task_log_notice(Slapi_Task *task, char *format, ...) -{ - va_list ap; - char buffer[LOG_BUFFER]; - size_t len; - - va_start(ap, format); - PR_vsnprintf(buffer, LOG_BUFFER, format, ap); - va_end(ap); - - len = 2 + strlen(buffer) + (task->task_log ? strlen(task->task_log) : 0); - if ((len > MAX_SCROLLBACK_BUFFER) && task->task_log) { - size_t i; - char *newbuf; - - /* start from middle of buffer, and find next linefeed */ - i = strlen(task->task_log)/2; - while (task->task_log[i] && (task->task_log[i] != '\n')) - i++; - if (task->task_log[i]) - i++; - len = strlen(task->task_log) - i + 2 + strlen(buffer); - newbuf = (char *)slapi_ch_malloc(len); - if (! newbuf) - return; /* out of memory? */ - strcpy(newbuf, task->task_log + i); - slapi_ch_free((void **)&task->task_log); - task->task_log = newbuf; - } else { - if (! task->task_log) { - task->task_log = (char *)slapi_ch_malloc(len); - task->task_log[0] = 0; - } else { - task->task_log = (char *)slapi_ch_realloc(task->task_log, len); - } - if (! task->task_log) - return; /* out of memory? */ - } - - if (task->task_log[0]) - strcat(task->task_log, "\n"); - strcat(task->task_log, buffer); - - slapi_task_status_changed(task); -} - -static int task_generic_destructor(Slapi_Task *task) +static void task_generic_destructor(Slapi_Task *task) { if (task->task_log) { slapi_ch_free((void **)&task->task_log); @@ -351,7 +647,6 @@ slapi_ch_free((void **)&task->task_status); } task->task_log = task->task_status = NULL; - return 0; } @@ -553,13 +848,12 @@ } /* allocate new task now */ - task = new_task(slapi_entry_get_ndn(e)); + task = slapi_new_task(slapi_entry_get_ndn(e)); if (task == NULL) { LDAPDebug(LDAP_DEBUG_ANY, "unable to allocate new task!\n", 0, 0, 0); rv = LDAP_OPERATIONS_ERROR; goto out; } - task->task_state = SLAPI_TASK_SETUP; memset(&mypb, 0, sizeof(mypb)); mypb.pb_backend = be; @@ -575,7 +869,7 @@ mypb.pb_ldif_include = include; mypb.pb_ldif_exclude = exclude; mypb.pb_task = task; - mypb.pb_task_flags = TASK_RUNNING_AS_TASK; + mypb.pb_task_flags = SLAPI_TASK_RUNNING_AS_TASK; if (NULL != encrypt_on_import && 0 == strcasecmp(encrypt_on_import, "true") ) { mypb.pb_ldif_encrypt = 1; } @@ -618,10 +912,7 @@ g_incr_active_threadcnt(); for (count = 0, inp = instance_names; *inp; inp++, count++) ; - task->task_work = count; - task->task_progress = 0; - task->task_state = SLAPI_TASK_RUNNING; - slapi_task_status_changed(task); + slapi_task_begin(task, count); for (inp = instance_names; *inp; inp++) { int release_me = 0; @@ -693,8 +984,7 @@ if (rv != 0) break; - task->task_progress++; - slapi_task_status_changed(task); + slapi_task_inc_progress(task); } /* free the memory now */ @@ -712,9 +1002,7 @@ LDAPDebug(LDAP_DEBUG_ANY, "Export failed.\n", 0, 0, 0); } - task->task_exitcode = rv; - task->task_state = SLAPI_TASK_FINISHED; - slapi_task_status_changed(task); + slapi_task_finish(task, rv); g_decr_active_threadcnt(); } @@ -888,16 +1176,13 @@ } /* allocate new task now */ - task = new_task(slapi_entry_get_ndn(e)); + task = slapi_new_task(slapi_entry_get_ndn(e)); if (task == NULL) { LDAPDebug(LDAP_DEBUG_ANY, "unable to allocate new task!\n", 0, 0, 0); *returncode = LDAP_OPERATIONS_ERROR; rv = SLAPI_DSE_CALLBACK_ERROR; goto out; } - task->task_state = SLAPI_TASK_SETUP; - task->task_work = instance_cnt; - task->task_progress = 0; mypb = slapi_pblock_new(); if (mypb == NULL) { @@ -914,7 +1199,7 @@ /* horrible hack */ mypb->pb_instance_name = (char *)instance_names; mypb->pb_task = task; - mypb->pb_task_flags = TASK_RUNNING_AS_TASK; + mypb->pb_task_flags = SLAPI_TASK_RUNNING_AS_TASK; if (NULL != decrypt_on_export && 0 == strcasecmp(decrypt_on_export, "true") ) { mypb->pb_ldif_encrypt = 1; } @@ -957,10 +1242,7 @@ int rv; g_incr_active_threadcnt(); - task->task_work = 1; - task->task_progress = 0; - task->task_state = SLAPI_TASK_RUNNING; - slapi_task_status_changed(task); + slapi_task_begin(task, 1); slapi_task_log_notice(task, "Beginning backup of '%s'", pb->pb_plugin->plg_name); @@ -978,11 +1260,7 @@ LDAPDebug(LDAP_DEBUG_ANY, "Backup finished.\n", 0, 0, 0); } - task->task_progress = 1; - task->task_exitcode = rv; - task->task_state = SLAPI_TASK_FINISHED; - slapi_task_status_changed(task); - + slapi_task_finish(task, rv); slapi_ch_free((void **)&pb->pb_seq_val); slapi_pblock_destroy(pb); g_decr_active_threadcnt(); @@ -1048,16 +1326,13 @@ } /* allocate new task now */ - task = new_task(slapi_entry_get_ndn(e)); + task = slapi_new_task(slapi_entry_get_ndn(e)); if (task == NULL) { LDAPDebug(LDAP_DEBUG_ANY, "unable to allocate new task!\n", 0, 0, 0); *returncode = LDAP_OPERATIONS_ERROR; rv = SLAPI_DSE_CALLBACK_ERROR; goto out; } - task->task_state = SLAPI_TASK_SETUP; - task->task_work = 1; - task->task_progress = 0; mypb = slapi_pblock_new(); if (mypb == NULL) { @@ -1068,7 +1343,7 @@ mypb->pb_seq_val = slapi_ch_strdup(archive_dir); mypb->pb_plugin = be->be_database; mypb->pb_task = task; - mypb->pb_task_flags = TASK_RUNNING_AS_TASK; + mypb->pb_task_flags = SLAPI_TASK_RUNNING_AS_TASK; /* start the backup as a separate thread */ thread = PR_CreateThread(PR_USER_THREAD, task_backup_thread, @@ -1102,10 +1377,7 @@ int rv; g_incr_active_threadcnt(); - task->task_work = 1; - task->task_progress = 0; - task->task_state = SLAPI_TASK_RUNNING; - slapi_task_status_changed(task); + slapi_task_begin(task, 1); slapi_task_log_notice(task, "Beginning restore to '%s'", pb->pb_plugin->plg_name); @@ -1123,11 +1395,7 @@ LDAPDebug(LDAP_DEBUG_ANY, "Restore finished.\n", 0, 0, 0); } - task->task_progress = 1; - task->task_exitcode = rv; - task->task_state = SLAPI_TASK_FINISHED; - slapi_task_status_changed(task); - + slapi_task_finish(task, rv); slapi_ch_free((void **)&pb->pb_seq_val); slapi_pblock_destroy(pb); g_decr_active_threadcnt(); @@ -1199,16 +1467,13 @@ } /* allocate new task now */ - task = new_task(slapi_entry_get_ndn(e)); + task = slapi_new_task(slapi_entry_get_ndn(e)); if (task == NULL) { LDAPDebug(LDAP_DEBUG_ANY, "unable to allocate new task!\n", 0, 0, 0); *returncode = LDAP_OPERATIONS_ERROR; rv = SLAPI_DSE_CALLBACK_ERROR; goto out; } - task->task_state = SLAPI_TASK_SETUP; - task->task_work = 1; - task->task_progress = 0; mypb = slapi_pblock_new(); if (mypb == NULL) { @@ -1221,7 +1486,7 @@ if (NULL != instance_name) mypb->pb_instance_name = slapi_ch_strdup(instance_name); mypb->pb_task = task; - mypb->pb_task_flags = TASK_RUNNING_AS_TASK; + mypb->pb_task_flags = SLAPI_TASK_RUNNING_AS_TASK; /* start the restore as a separate thread */ thread = PR_CreateThread(PR_USER_THREAD, task_restore_thread, @@ -1255,10 +1520,7 @@ int rv; g_incr_active_threadcnt(); - task->task_work = 1; - task->task_progress = 0; - task->task_state = SLAPI_TASK_RUNNING; - slapi_task_status_changed(task); + slapi_task_begin(task, 1); rv = (*pb->pb_plugin->plg_db2index)(pb); if (rv != 0) { @@ -1267,11 +1529,7 @@ LDAPDebug(LDAP_DEBUG_ANY, "Index failed (error %d)\n", rv, 0, 0); } - task->task_progress = task->task_work; - task->task_exitcode = rv; - task->task_state = SLAPI_TASK_FINISHED; - slapi_task_status_changed(task); - + slapi_task_finish(task, rv); charray_free(pb->pb_db2index_attrs); slapi_ch_free((void **)&pb->pb_instance_name); slapi_pblock_destroy(pb); @@ -1353,16 +1611,13 @@ } /* allocate new task now */ - task = new_task(slapi_entry_get_ndn(e)); + task = slapi_new_task(slapi_entry_get_ndn(e)); if (task == NULL) { LDAPDebug(LDAP_DEBUG_ANY, "unable to allocate new task!\n", 0, 0, 0); *returncode = LDAP_OPERATIONS_ERROR; rv = SLAPI_DSE_CALLBACK_ERROR; goto out; } - task->task_state = SLAPI_TASK_SETUP; - task->task_work = 1; - task->task_progress = 0; mypb = slapi_pblock_new(); if (mypb == NULL) { @@ -1375,7 +1630,7 @@ mypb->pb_instance_name = slapi_ch_strdup(instance_name); mypb->pb_db2index_attrs = indexlist; mypb->pb_task = task; - mypb->pb_task_flags = TASK_RUNNING_AS_TASK; + mypb->pb_task_flags = SLAPI_TASK_RUNNING_AS_TASK; /* start the db2index as a separate thread */ thread = PR_CreateThread(PR_USER_THREAD, task_index_thread, @@ -1460,14 +1715,14 @@ } /* allocate new task now */ - task = new_task(slapi_entry_get_ndn(e)); + task = slapi_new_task(slapi_entry_get_ndn(e)); if (task == NULL) { LDAPDebug(LDAP_DEBUG_ANY, "unable to allocate new task!\n", 0, 0, 0); *returncode = LDAP_OPERATIONS_ERROR; rv = SLAPI_DSE_CALLBACK_ERROR; goto out; } - task->task_state = SLAPI_TASK_SETUP; + /* NGK - This could use some cleanup to use the SLAPI task API, such as slapi_task_begin() */ task->task_work = 1; task->task_progress = 0; @@ -1478,7 +1733,7 @@ mypb.pb_seq_type = SLAPI_UPGRADEDB_FORCE; /* force; reindex all regardless the dbversion */ mypb.pb_seq_val = slapi_ch_strdup(archive_dir); mypb.pb_task = task; - mypb.pb_task_flags = TASK_RUNNING_AS_TASK; + mypb.pb_task_flags = SLAPI_TASK_RUNNING_AS_TASK; rv = (mypb.pb_plugin->plg_upgradedb)(&mypb); if (rv == 0) { @@ -1502,76 +1757,6 @@ return SLAPI_DSE_CALLBACK_OK; } -/* update attributes in the entry under "cn=tasks" to match the current - * status of the task. - */ -#define NEXTMOD(_type, _val) do { \ - modlist[cur].mod_op = LDAP_MOD_REPLACE; \ - modlist[cur].mod_type = (_type); \ - modlist[cur].mod_values = (char **)slapi_ch_malloc(2*sizeof(char *)); \ - modlist[cur].mod_values[0] = (_val); \ - modlist[cur].mod_values[1] = NULL; \ - mod[cur] = &modlist[cur]; \ - cur++; \ -} while (0) -void slapi_task_status_changed(Slapi_Task *task) -{ - LDAPMod modlist[20]; - LDAPMod *mod[20]; - int cur = 0, i; - char s1[20], s2[20], s3[20]; - - if (shutting_down) { - /* don't care about task status updates anymore */ - return; - } - - NEXTMOD(TASK_LOG_NAME, task->task_log); - NEXTMOD(TASK_STATUS_NAME, task->task_status); - sprintf(s1, "%d", task->task_exitcode); - sprintf(s2, "%d", task->task_progress); - sprintf(s3, "%d", task->task_work); - NEXTMOD(TASK_PROGRESS_NAME, s2); - NEXTMOD(TASK_WORK_NAME, s3); - /* only add the exit code when the job is done */ - if ((task->task_state == SLAPI_TASK_FINISHED) || - (task->task_state == SLAPI_TASK_CANCELLED)) { - NEXTMOD(TASK_EXITCODE_NAME, s1); - /* make sure the console can tell the task has ended */ - if (task->task_progress != task->task_work) { - task->task_progress = task->task_work; - } - } - - mod[cur] = NULL; - modify_internal_entry(task->task_dn, mod); - - for (i = 0; i < cur; i++) - slapi_ch_free((void **)&modlist[i].mod_values); - - if ((task->task_state == SLAPI_TASK_FINISHED) && - !(task->task_flags & SLAPI_TASK_DESTROYING)) { - Slapi_PBlock *pb = slapi_pblock_new(); - Slapi_Entry *e; - int ttl; - time_t expire; - - e = get_internal_entry(pb, task->task_dn); - if (e == NULL) - return; - ttl = atoi(fetch_attr(e, "ttl", DEFAULT_TTL)); - if (ttl > 3600) - ttl = 3600; /* be reasonable. */ - expire = time(NULL) + ttl; - task->task_flags |= SLAPI_TASK_DESTROYING; - /* queue an event to destroy the state info */ - slapi_eq_once(destroy_task, (void *)task, expire); - - slapi_free_search_results_internal(pb); - slapi_pblock_destroy(pb); - } -} - /* cleanup old tasks that may still be in the DSE from a previous session * (this can happen if the server crashes [no matter how unlikely we like * to think that is].) @@ -1636,84 +1821,6 @@ slapi_pblock_destroy(pb); } -/* name is, for exmaple, "import" */ -int slapi_task_register_handler(const char *name, dseCallbackFn func) -{ - char *dn = NULL; - Slapi_PBlock *pb = NULL; - Slapi_Operation *op; - LDAPMod *mods[3]; - LDAPMod mod[3]; - const char *objectclass[3]; - const char *cnvals[2]; - int ret = -1; - int x; - - dn = slapi_ch_smprintf("cn=%s, %s", name, TASK_BASE_DN); - if (dn == NULL) { - goto out; - } - - pb = slapi_pblock_new(); - if (pb == NULL) { - goto out; - } - - /* this is painful :( */ - mods[0] = &mod[0]; - mod[0].mod_op = LDAP_MOD_ADD; - mod[0].mod_type = "objectClass"; - mod[0].mod_values = (char **)objectclass; - objectclass[0] = "top"; - objectclass[1] = "extensibleObject"; - objectclass[2] = NULL; - mods[1] = &mod[1]; - mod[1].mod_op = LDAP_MOD_ADD; - mod[1].mod_type = "cn"; - mod[1].mod_values = (char **)cnvals; - cnvals[0] = name; - cnvals[1] = NULL; - mods[2] = NULL; - slapi_add_internal_set_pb(pb, dn, mods, NULL, - plugin_get_default_component_id(), 0); - x = 1; - slapi_pblock_set(pb, SLAPI_DSE_DONT_WRITE_WHEN_ADDING, &x); - /* Make sure these adds don't appear in the audit and change logs */ - slapi_pblock_get(pb, SLAPI_OPERATION, &op); - operation_set_flag(op, OP_FLAG_ACTION_NOLOG); - - slapi_add_internal_pb(pb); - slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &x); - if ((x != LDAP_SUCCESS) && (x != LDAP_ALREADY_EXISTS)) { - LDAPDebug(LDAP_DEBUG_ANY, - "Can't create task node '%s' (error %d)\n", - name, x, 0); - ret = x; - goto out; - } - - /* register add callback */ - slapi_config_register_callback(SLAPI_OPERATION_ADD, DSE_FLAG_PREOP, - dn, LDAP_SCOPE_SUBTREE, "(objectclass=*)", func, NULL); - /* deny modify/delete of the root task entry */ - slapi_config_register_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_PREOP, - dn, LDAP_SCOPE_BASE, "(objectclass=*)", task_deny, NULL); - slapi_config_register_callback(SLAPI_OPERATION_DELETE, DSE_FLAG_PREOP, - dn, LDAP_SCOPE_BASE, "(objectclass=*)", task_deny, NULL); - - ret = 0; - -out: - if (dn) { - slapi_ch_free((void **)&dn); - } - if (pb) { - slapi_pblock_destroy(pb); - } - return ret; -} - - void task_init(void) { global_task_lock = PR_NewLock();

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm archive.c, 1.15, 1.16 back-ldbm.h, 1.12, 1.13 dblayer.c, 1.26, 1.27 import.c, 1.10, 1.11 ldif2ldbm.c, 1.15, 1.16
by Doctor Conrad 03 Apr '08

03 Apr '08

Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18174/ldap/servers/slapd/back-ldbm Modified Files: archive.c back-ldbm.h dblayer.c import.c ldif2ldbm.c Log Message: Resolves: 439907 Summary: Enhanced SLAPI task API and ported existing tasks to use new API. Index: archive.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/archive.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- archive.c 4 Dec 2007 17:52:56 -0000 1.15 +++ archive.c 3 Apr 2008 16:52:47 -0000 1.16 @@ -61,7 +61,7 @@ slapi_pblock_get( pb, SLAPI_BACKEND_INSTANCE_NAME, &backendname); slapi_pblock_get( pb, SLAPI_BACKEND_TASK, &task ); slapi_pblock_get( pb, SLAPI_TASK_FLAGS, &task_flags ); - li->li_flags = run_from_cmdline = (task_flags & TASK_RUNNING_FROM_COMMANDLINE); + li->li_flags = run_from_cmdline = (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE); if ( !rawdirectory || !*rawdirectory ) { LDAPDebug( LDAP_DEBUG_ANY, "archive2db: no archive name\n", @@ -273,7 +273,7 @@ slapi_pblock_get( pb, SLAPI_PLUGIN_PRIVATE, &li ); slapi_pblock_get( pb, SLAPI_SEQ_VAL, &rawdirectory ); slapi_pblock_get( pb, SLAPI_TASK_FLAGS, &task_flags ); - li->li_flags = run_from_cmdline = (task_flags & TASK_RUNNING_FROM_COMMANDLINE); + li->li_flags = run_from_cmdline = (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE); slapi_pblock_get( pb, SLAPI_BACKEND_TASK, &task ); Index: back-ldbm.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/back-ldbm.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- back-ldbm.h 19 Oct 2007 02:09:24 -0000 1.12 +++ back-ldbm.h 3 Apr 2008 16:52:47 -0000 1.13 @@ -513,10 +513,10 @@ int li_legacy_errcode; /* 615428 -- in case legacy err code is expected */ }; -/* li_flags could store these bits defined in ../slap.h +/* li_flags could store these bits defined in ../slapi-plugin.h * task flag (pb_task_flags) * - * #define TASK_RUNNING_AS_TASK 0x0 - * #define TASK_RUNNING_FROM_COMMANDLINE 0x1 + * SLAPI_TASK_RUNNING_AS_TASK + * SLAPI_TASK_RUNNING_FROM_COMMANDLINE */ /* allow conf w/o CONFIG_FLAG_ALLOW_RUNNING_CHANGE to be updated */ #define LI_FORCE_MOD_CONFIG 0x10 Index: dblayer.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- dblayer.c 4 Dec 2007 00:50:19 -0000 1.26 +++ dblayer.c 3 Apr 2008 16:52:47 -0000 1.27 @@ -1954,7 +1954,7 @@ oflags |= DB_PRIVATE; } PR_Lock(li->li_config_mutex); - if ((li->li_flags & TASK_RUNNING_FROM_COMMANDLINE) && + if ((li->li_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE) && (li->li_import_cache_autosize)) /* Autosizing importCache * Need to re-eval every time * to guarantee the memory is @@ -5678,7 +5678,7 @@ * dse_conf_verify may need to have db started, as well. */ /* If no logfiles were stored, then fatal recovery isn't required */ - if (li->li_flags & TASK_RUNNING_FROM_COMMANDLINE) + if (li->li_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE) { /* command line mode; no need to run db threads */ dbmode |= DBLAYER_NO_DBTHREADS_MODE; @@ -5707,7 +5707,7 @@ "Warning: Unable to verify the index configuration\n", 0, 0, 0); } - if (li->li_flags & TASK_RUNNING_FROM_COMMANDLINE) { + if (li->li_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE) { /* command line: close the database down again */ tmp_rval = dblayer_close(li, dbmode); if (0 != tmp_rval) { Index: import.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.c 18 Oct 2007 00:08:34 -0000 1.10 +++ import.c 3 Apr 2008 16:52:47 -0000 1.11 @@ -197,29 +197,19 @@ buffer, 0); } -static int import_task_destroy(Slapi_Task *task) +static void import_task_destroy(Slapi_Task *task) { - ImportJob *job = (ImportJob *)task->task_private; - - if (task->task_log) { - slapi_ch_free((void **)&task->task_log); - } - - if (task->task_status) { - slapi_ch_free((void **)&task->task_status); - } - + ImportJob *job = (ImportJob *)slapi_task_get_data(task); if (job && job->task_status) { slapi_ch_free((void **)&job->task_status); job->task_status = NULL; } FREE(job); - task->task_private = NULL; - return 0; + slapi_task_set_data(task, NULL); } -static int import_task_abort(Slapi_Task *task) +static void import_task_abort(Slapi_Task *task) { ImportJob *job; @@ -227,9 +217,8 @@ * DSE lock for modify... */ - if (task->task_state == SLAPI_TASK_FINISHED) { + if (slapi_task_get_state(task) == SLAPI_TASK_FINISHED) { /* too late */ - return 0; } /* @@ -238,14 +227,12 @@ * because it will free the job. */ - job = (ImportJob *)task->task_private; + job = (ImportJob *)slapi_task_get_data(task); import_abort_all(job, 0); - while (task->task_state != SLAPI_TASK_FINISHED) + while (slapi_task_get_state(task) != SLAPI_TASK_FINISHED) DS_Sleep(PR_MillisecondsToInterval(100)); - - return 0; } @@ -1042,13 +1029,8 @@ slapi_ch_free_string(&inst_dirp); } - if (job->task != NULL && 0 == job->task->task_refcount) { - /* exit code */ - job->task->task_exitcode = ret; - job->task->task_state = SLAPI_TASK_FINISHED; - job->task->task_progress = job->task->task_work; - job->task->task_private = NULL; - slapi_task_status_changed(job->task); + if ((job->task != NULL) && (0 == slapi_task_get_refcount(job->task))) { + slapi_task_finish(job->task, ret); } if (job->flags & FLAG_ONLINE) { @@ -1093,7 +1075,7 @@ ImportWorkerInfo *producer = NULL; if (job->task) - job->task->task_refcount++; + slapi_task_inc_refcount(job->task); PR_ASSERT(inst != NULL); time(&beginning); @@ -1364,13 +1346,11 @@ if (0 != ret) { import_log_notice(job, "Import failed."); if (job->task != NULL) { - job->task->task_state = SLAPI_TASK_FINISHED; - job->task->task_exitcode = ret; - slapi_task_status_changed(job->task); + slapi_task_finish(job->task, ret); } } else { if (job->task) - job->task->task_refcount--; + slapi_task_dec_refcount(job->task); import_all_done(job, ret); } @@ -1471,15 +1451,17 @@ /* add 1 to account for post-import cleanup (which can take a * significant amount of time) */ + /* NGK - This should eventually be cleaned up to use the public + * task API. */ if (0 == total_files) /* reindexing */ job->task->task_work = 2; else job->task->task_work = total_files + 1; job->task->task_progress = 0; job->task->task_state = SLAPI_TASK_RUNNING; - job->task->task_private = job; - job->task->destructor = import_task_destroy; - job->task->cancel = import_task_abort; + slapi_task_set_data(job->task, job); + slapi_task_set_destructor_fn(job->task, import_task_destroy); + slapi_task_set_cancel_fn(job->task, import_task_abort); job->flags |= FLAG_ONLINE; /* create thread for import_main, so we can return */ Index: ldif2ldbm.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldif2ldbm.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ldif2ldbm.c 13 Oct 2007 01:49:32 -0000 1.15 +++ ldif2ldbm.c 3 Apr 2008 16:52:47 -0000 1.16 @@ -568,7 +568,7 @@ /* hopefully this will go away once import is not run standalone... */ slapi_pblock_get(pb, SLAPI_TASK_FLAGS, &task_flags); - if (task_flags & TASK_RUNNING_FROM_COMMANDLINE) { + if (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE) { /* initialize UniqueID generator - must be done once backends are started and event queue is initialized but before plugins are started */ Slapi_DN *sdn = slapi_sdn_new_dn_byval ("cn=uniqueid generator,cn=config"); @@ -581,7 +581,7 @@ return -1; } - li->li_flags |= TASK_RUNNING_FROM_COMMANDLINE; + li->li_flags |= SLAPI_TASK_RUNNING_FROM_COMMANDLINE; ldbm_config_load_dse_info(li); autosize_import_cache(li); } @@ -604,7 +604,7 @@ /***** prepare & init libdb and dblayer *****/ - if (! (task_flags & TASK_RUNNING_FROM_COMMANDLINE)) { + if (! (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE)) { /* shutdown this instance of the db */ LDAPDebug(LDAP_DEBUG_ANY, "Bringing %s offline...\n", instance_name, 0, 0); @@ -778,11 +778,11 @@ slapi_pblock_get( pb, SLAPI_TASK_FLAGS, &task_flags ); slapi_pblock_get( pb, SLAPI_DB2LDIF_DECRYPT, &decrypt ); slapi_pblock_get( pb, SLAPI_DB2LDIF_SERVER_RUNNING, &server_running ); - run_from_cmdline = (task_flags & TASK_RUNNING_FROM_COMMANDLINE); + run_from_cmdline = (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE); dump_replica = pb->pb_ldif_dump_replica; if (run_from_cmdline) { - li->li_flags |= TASK_RUNNING_FROM_COMMANDLINE; + li->li_flags |= SLAPI_TASK_RUNNING_FROM_COMMANDLINE; if (!dump_replica) { we_start_the_backends = 1; } @@ -1298,12 +1298,12 @@ slapi_pblock_get(pb, SLAPI_BACKEND_INSTANCE_NAME, &instance_name); slapi_pblock_get(pb, SLAPI_PLUGIN_PRIVATE, &li); slapi_pblock_get(pb, SLAPI_TASK_FLAGS, &task_flags); - run_from_cmdline = (task_flags & TASK_RUNNING_FROM_COMMANDLINE); + run_from_cmdline = (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE); slapi_pblock_get(pb, SLAPI_BACKEND_TASK, &task); if (run_from_cmdline) { /* No ldbm backend exists until we process the config info. */ - li->li_flags |= TASK_RUNNING_FROM_COMMANDLINE; + li->li_flags |= SLAPI_TASK_RUNNING_FROM_COMMANDLINE; ldbm_config_load_dse_info(li); txn.back_txn_txn = NULL; /* no transaction */ } @@ -1764,6 +1764,8 @@ percent = (ep->ep_id*100 / (lastid ? lastid : 1)); } if (task) { + /* NGK - This should eventually be cleaned up to use the + * public task API */ task->task_progress = (idl ? idindex : ep->ep_id); task->task_work = (idl ? idl->b_nids : lastid); slapi_task_status_changed(task); @@ -1970,7 +1972,7 @@ slapi_pblock_get(pb, SLAPI_BACKEND_TASK, &task); slapi_pblock_get(pb, SLAPI_DB2LDIF_SERVER_RUNNING, &server_running); - run_from_cmdline = (task_flags & TASK_RUNNING_FROM_COMMANDLINE); + run_from_cmdline = (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE); slapi_pblock_get(pb, SLAPI_PLUGIN_PRIVATE, &li); if (run_from_cmdline) { @@ -2435,7 +2437,7 @@ int run_from_cmdline = 0; slapi_pblock_get(pb, SLAPI_TASK_FLAGS, &task_flags); - run_from_cmdline = (task_flags & TASK_RUNNING_FROM_COMMANDLINE); + run_from_cmdline = (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE); be = inst->inst_be; slapi_log_error(SLAPI_LOG_FATAL, "upgrade DB",

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/plugins/memberof memberof.c, 1.4, 1.5
by Doctor Conrad 03 Apr '08

03 Apr '08

Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18174/ldap/servers/plugins/memberof Modified Files: memberof.c Log Message: Resolves: 439907 Summary: Enhanced SLAPI task API and ported existing tasks to use new API. Index: memberof.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof/memberof.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- memberof.c 28 Mar 2008 21:45:52 -0000 1.4 +++ memberof.c 3 Apr 2008 16:52:46 -0000 1.5 @@ -49,10 +49,10 @@ * * To start the memberof task add an entry like: * - * dn: cn=memberof task 2, cn=memberof task, cn=tasks, cn=config + * dn: cn=mytask, cn=memberof task, cn=tasks, cn=config * objectClass: top * objectClass: extensibleObject - * cn: sample task + * cn: mytask * basedn: dc=example, dc=com * filter: (uid=test4) * @@ -75,7 +75,6 @@ #define MEMBEROF_GROUP_ATTR "member" #define MEMBEROF_ATTR "memberof" #define MEMBEROF_GROUP_ATTR_IS_DN 1 -#define MEMBEROF_GROUP_ATTR_TYPE "uid" #define MEMBEROF_GROUP_FILTER "(" MEMBEROF_GROUP_ATTR "=*)" #define MEMBEROF_PLUGIN_SUBSYSTEM "memberof-plugin" /* used for logging */ @@ -92,50 +91,6 @@ void *next; } memberofstringll; - - -/****** secrets *********/ - -/*from FDS slap.h - * until we get a proper api for access - */ -#define TASK_RUNNING_AS_TASK 0x0 - -/*from FDS slapi-private.h - * until we get a proper api for access - */ - - -#define SLAPI_DSE_CALLBACK_OK (1) -#define SLAPI_DSE_CALLBACK_ERROR (-1) -#define SLAPI_DSE_CALLBACK_DO_NOT_APPLY (0) - -/****************************************************************************** - * Online tasks interface (to support import, export, etc) - * After some cleanup, we could consider making these public. - */ -struct _slapi_task { - struct _slapi_task *next; - char *task_dn; - int task_exitcode; /* for the end user */ - int task_state; /* (see above) */ - int task_progress; /* number between 0 and task_work */ - int task_work; /* "units" of work to be done */ - int task_flags; /* (see above) */ - - /* it is the task's responsibility to allocate this memory & free it: */ - char *task_status; /* transient status info */ - char *task_log; /* appended warnings, etc */ - - void *task_private; /* for use by backends */ - TaskCallbackFn cancel; /* task has been cancelled by user */ - TaskCallbackFn destructor; /* task entry is being destroyed */ - int task_refcount; -}; - -/****** secrets ********/ - - /*** function prototypes ***/ /* exported functions */ @@ -169,7 +124,7 @@ static int memberof_del_attr_list(Slapi_PBlock *pb, char *groupdn, Slapi_Attr *attr); static int memberof_moddn_attr_list(Slapi_PBlock *pb, char *pre_dn, char *post_dn, Slapi_Attr *attr); -static int memberofd_replace_list(Slapi_PBlock *pb, char *group_dn); +static int memberof_replace_list(Slapi_PBlock *pb, char *group_dn); static void memberof_set_plugin_id(void * plugin_id); static void *memberof_get_plugin_id(); static int memberof_compare(const void *a, const void *b); @@ -195,9 +150,10 @@ static int memberof_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, char *returntext, void *arg); +static void memberof_task_destructor(Slapi_Task *task); static const char *fetch_attr(Slapi_Entry *e, const char *attrname, const char *default_val); -static void memberof_memberof_fixup_task_thread(void *arg); +static void memberof_fixup_task_thread(void *arg); static int memberof_fix_memberof(char *dn, char *filter_str); static int memberof_fix_memberof_callback(Slapi_Entry *e, void *callback_data); @@ -511,6 +467,8 @@ memberof_lock(); + /* get a list of member attributes present in the group + * entry that is being renamed. */ if(0 == slapi_entry_attr_find(post_e, MEMBEROF_GROUP_ATTR, &attr)) { memberof_moddn_attr_list(pb, pre_dn, post_dn, attr); @@ -656,7 +614,7 @@ { /* If there are no values in the smod, we should * just do a replace instead. The user is just - * trying to delete all members from this this + * trying to delete all members from this group * entry, which the replace code deals with. */ if (slapi_mod_get_num_values(smod) == 0) { @@ -673,7 +631,7 @@ case LDAP_MOD_REPLACE: { /* replace current values */ - memberofd_replace_list(pb, dn); + memberof_replace_list(pb, dn); break; } @@ -877,6 +835,14 @@ { op_str = "ADD"; } + else if(LDAP_MOD_REPLACE == mod_op) + { + op_str = "REPLACE"; + } + else + { + op_str = "UNKNOWN"; + } slapi_log_error( SLAPI_LOG_PLUGIN, MEMBEROF_PLUGIN_SUBSYSTEM, "memberof_modop_one_r: %s %s in %s\n" @@ -1347,7 +1313,7 @@ return rc; } -/* memberof_memberof_search_callback() +/* memberof_test_membership() * for each attribute in the memberof attribute * determine if the entry is still a member * @@ -1517,7 +1483,7 @@ * Perform replace the group DN list in the memberof attribute of the list of targets * */ -int memberofd_replace_list(Slapi_PBlock *pb, char *group_dn) +int memberof_replace_list(Slapi_PBlock *pb, char *group_dn) { struct slapi_entry *pre_e = NULL; struct slapi_entry *post_e = NULL; @@ -1876,29 +1842,22 @@ slapi_unlock_mutex(memberof_operation_lock); } -/* - * - */ - typedef struct _task_data { char *dn; char *filter_str; - Slapi_Task *task; } task_data; -void memberof_memberof_fixup_task_thread(void *arg) +void memberof_fixup_task_thread(void *arg) { - task_data *td = (task_data *)arg; - Slapi_Task *task = td->task; + Slapi_Task *task = (Slapi_Task *)arg; + task_data *td = NULL; int rc = 0; - task->task_work = 1; - task->task_progress = 0; - task->task_state = SLAPI_TASK_RUNNING; - - slapi_task_status_changed(task); + /* Fetch our task data from the task */ + td = (task_data *)slapi_task_get_data(task); + slapi_task_begin(task, 1); slapi_task_log_notice(task, "Memberof task starts (arg: %s) ...\n", td->filter_str); @@ -1907,20 +1866,10 @@ slapi_task_log_notice(task, "Memberof task finished."); slapi_task_log_status(task, "Memberof task finished."); + slapi_task_inc_progress(task); - task->task_progress = 1; - task->task_exitcode = rc; - task->task_state = SLAPI_TASK_FINISHED; - slapi_task_status_changed(task); - - slapi_ch_free_string(&td->dn); - slapi_ch_free_string(&td->filter_str); - - { - /* make the compiler happy */ - void *ptd = td; - slapi_ch_free(&ptd); - } + /* this will queue the destruction of the task */ + slapi_task_finish(task, rc); } /* extract a single value from the entry (as a string) -- if it's not in the @@ -1966,13 +1915,7 @@ goto out; } - /* allocate new task now */ - task = slapi_new_task(slapi_entry_get_ndn(e)); - task->task_state = SLAPI_TASK_SETUP; - task->task_work = 1; - task->task_progress = 0; - - /* create a pblock to pass the necessary info to the task thread */ + /* setup our task data */ mytaskdata = (task_data*)slapi_ch_malloc(sizeof(task_data)); if (mytaskdata == NULL) { @@ -1982,11 +1925,19 @@ } mytaskdata->dn = slapi_ch_strdup(dn); mytaskdata->filter_str = slapi_ch_strdup(filter); - mytaskdata->task = task; + + /* allocate new task now */ + task = slapi_new_task(slapi_entry_get_ndn(e)); + + /* register our destructor for cleaning up our private data */ + slapi_task_set_destructor_fn(task, memberof_task_destructor); + + /* Stash a pointer to our data in the task */ + slapi_task_set_data(task, mytaskdata); /* start the sample task as a separate thread */ - thread = PR_CreateThread(PR_USER_THREAD, memberof_memberof_fixup_task_thread, - (void *)mytaskdata, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, + thread = PR_CreateThread(PR_USER_THREAD, memberof_fixup_task_thread, + (void *)task, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE); if (thread == NULL) { @@ -1994,28 +1945,29 @@ "unable to create task thread!\n"); *returncode = LDAP_OPERATIONS_ERROR; rv = SLAPI_DSE_CALLBACK_ERROR; - - slapi_ch_free_string(&mytaskdata->dn); - slapi_ch_free_string(&mytaskdata->filter_str); - - { - void *ptask = mytaskdata; - slapi_ch_free(&ptask); - goto out; - } + slapi_task_finish(task, *returncode); + } else { + rv = SLAPI_DSE_CALLBACK_OK; } - /* thread successful -- don't free the pb, let the thread do that. */ - return SLAPI_DSE_CALLBACK_OK; - out: - if (task) - { - slapi_destroy_task(task); - } return rv; } +void +memberof_task_destructor(Slapi_Task *task) +{ + if (task) { + task_data *mydata = (task_data *)slapi_task_get_data(task); + if (mydata) { + slapi_ch_free_string(&mydata->dn); + slapi_ch_free_string(&mydata->filter_str); + /* Need to cast to avoid a compiler warning */ + slapi_ch_free((void **)&mydata); + } + } +} + int memberof_fix_memberof(char *dn, char *filter_str) { int rc = 0;

1 0

[Fedora-directory-commits] dsgw/orghtml botframe.html, 1.2, 1.3 topframe.html.in, 1.3, 1.4
by Doctor Conrad 01 Apr '08

01 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsgw/orghtml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12376/dsgw/orghtml Modified Files: botframe.html topframe.html.in Log Message: Resolves: bug 435230 Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc) Fix Description: This is the third pass, fixing the orgchart. Nothing really major, just fixing mostly table, tr, td, and img attributes. Tried to be a little smarter about when to actually create table rows - html tidy does not like empty table rows. Platforms tested: RHEL5 x86_64 Flag day: no Doc: none yet Index: botframe.html =================================================================== RCS file: /cvs/dirsec/dsgw/orghtml/botframe.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- botframe.html 28 Jan 2008 21:22:48 -0000 1.2 +++ botframe.html 1 Apr 2008 20:10:11 -0000 1.3 @@ -42,7 +42,7 @@ <LINK REL=stylesheet TYPE="text/css" HREF="styles.css"> </head> <body bgcolor="#FFFFFF"> -<table cellspacing="-1" cellpadding="2" border="0" width="100%"> +<table cellspacing="0" cellpadding="2" border="0" width="100%"> <tr> <td align="left" class="pageHeader">Welcome!<br><br></td> </tr> @@ -53,10 +53,10 @@ Below is a sample of an organization chart, with a description of the<br> types of actions you can take<BR><BR> Thank you for using the Directory Server Org Chart! +<br><br> </td> </tr> +<tr align="center"><td><img src="starthelp.gif" border="0" alt=""></td></tr> </table> -<br><br> -<tr align="center"><img src="starthelp.gif" border="0" alt=""></tr> </body> </html> Index: topframe.html.in =================================================================== RCS file: /cvs/dirsec/dsgw/orghtml/topframe.html.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- topframe.html.in 6 Mar 2008 22:00:39 -0000 1.3 +++ topframe.html.in 1 Apr 2008 20:10:11 -0000 1.4 @@ -38,6 +38,7 @@ "http://www.w3.org/TR/html4/strict.dtd"> <HTML> <HEAD> +<title>Org Chart</title> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> <META HTTP-EQUIV="Expires" CONTENT="Thu, 01 Feb 1996 00:00:00 GMT"> <SCRIPT type="text/javascript"> @@ -63,7 +64,7 @@ } else { - totalInput = "<HTML><BODY><BR><BR><BR><BR><font face=\"verdana, Arial, Helvetica, sans-serif\" style=\"font-size: 14px\"><B>Generating...</B></font></BODY></HTML>"; + totalInput = "<HTML><BODY><BR><BR><BR><BR><font face=\"verdana, Arial, Helvetica, sans-serif\" style=\"font-size: 14px\"><B>Generating...<\/B><\/font><\/BODY><\/HTML>"; viewFrame = self.parent.output_window.document; viewFrame.open(); @@ -99,14 +100,14 @@ <span class="apptext">      Search for:</span> </TD> <TD nowrap valign="middle"> - <span class="apptext"> <FORM name="form2" Method=POST action="@cgiuri@/org" target="output_window" onsubmit="return doSearch(document.form2.data.value)"> + <span class="apptext"> <font face="verdana, Arial, Helvetica, sans-serif" style="font-size: 12px"> <INPUT TYPE="TEXT" NAME="data" SIZE=20 MAXLENGTH=20> <input type="submit" name="Submit" value="Go"> </font> - </FORM> </span> + </FORM> </TD> </TR></TABLE> </TD>

1 0

[Fedora-directory-commits] dsgw/orgbin myorg.in, 1.4, 1.5 org.in, 1.6, 1.7
by Doctor Conrad 01 Apr '08

01 Apr '08

Author: rmeggins Update of /cvs/dirsec/dsgw/orgbin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12376/dsgw/orgbin Modified Files: myorg.in org.in Log Message: Resolves: bug 435230 Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc) Fix Description: This is the third pass, fixing the orgchart. Nothing really major, just fixing mostly table, tr, td, and img attributes. Tried to be a little smarter about when to actually create table rows - html tidy does not like empty table rows. Platforms tested: RHEL5 x86_64 Flag day: no Doc: none yet Index: myorg.in =================================================================== RCS file: /cvs/dirsec/dsgw/orgbin/myorg.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- myorg.in 20 Mar 2008 02:18:43 -0000 1.4 +++ myorg.in 1 Apr 2008 20:10:11 -0000 1.5 @@ -160,7 +160,7 @@ print " <body bgcolor=\"#FFFFFF\" style=\"leftmargin:0; topmargin:0; marginwidth:0; marginheight:0\" onLoad=\"initValues()\"> -<FORM name=\"customize\"> +<FORM name=\"customize\" action=\"javascript:void();\"> <table width=\"500\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" align=\"center\"> @@ -176,7 +176,7 @@ <tr> <td height=\"236\" valign=\"top\"> <table width=\"100%\" border=\"0\" cellpadding=\"2\" cellspacing=\"0\"> - <tr height=\"7\"></tr> + <tr style=\"height:7\"><td></td></tr> "; @@ -193,7 +193,7 @@ <td width=\"28\" height=\"21\" valign=\"top\"> </td> <td valign=\"top\" colspan=\"4\" class=\"prefsPageHead\">Icon Settings</td> </tr> - <tr height =\"7\"></tr> + <tr style=\"height:7\"><td></td></tr> <tr> <td width=\"35\" height=\"21\"></td> <td width=\"35\" valign=\"top\" class=\"prefsPageData\">Icon:</td> @@ -213,14 +213,14 @@ print " - <tr height=\"6\"></tr> + <tr style=\"height:6\"><td></td></tr> <tr> <td width=\"33\" height=\"21\"></td> <td width=\"20\" valign=\"top\" class=\"prefsPageData\"> <img src=\"@orguri@/mail.gif\" alt=\"\" width=\"14\" height=\"16\" border=\"0\"></td> <td width=\"25\"></td> <td width=\"105\" valign=\"top\" class=\"prefsPageData\">EMail</td> <td width=\"21\"></td> - <td width=\"205\" valign=\"center\" class=\"prefsPageData\"><select NAME=\"email\"> + <td width=\"205\" valign=\"middle\" class=\"prefsPageData\"><select NAME=\"email\"> "; # -------------------------------------------- @@ -248,14 +248,14 @@ if ( $config_tokens{"icons-phonebook-visible"} ne "disabled" ) { print " - <tr height=\"6\"></tr> + <tr style=\"height:6\"><td></td></tr> <tr> <td width=\"33\" height=\"21\"></td> <td width=\"20\" valign=\"top\" class=\"prefsPageData\"> <img src=\"@orguri@/ldap-person.gif\" alt=\"\" width=\"12\" height=\"16\" border=\"0\"></td> <td width=\"25\"></td> <td width=\"125\" valign=\"top\" class=\"prefsPageData\" nowrap>Phonebook Entry</td> <td width=\"21\"></td> - <td width=\"205\" valign=\"center\" class=\"prefsPageData\"><select NAME=\"phonebook\"> + <td width=\"205\" valign=\"middle\" class=\"prefsPageData\"><select NAME=\"phonebook\"> "; # -------------------------------------------- @@ -284,7 +284,7 @@ print " - <tr height=\"6\"></tr> + <tr style=\"height:6\"><td></td></tr> <tr> <td width=\"33\" height=\"21\"></td> <td width=\"20\" valign=\"top\" class=\"prefsPageData\"> <img src=\"@orguri@/mag.gif\" alt=\"\" width=\"15\" height=\"15\" border=\"0\"></td> @@ -320,7 +320,7 @@ { print " - <tr height=\"6\"></tr> + <tr style=\"height:6\"><td></td></tr> <tr> <td width=\"33\" height=\"21\"></td> <td width=\"20\" valign=\"top\" class=\"prefsPageData\"> <img src=\"@orguri@/aim-online.gif\" alt=\"\" width=\"15\" height=\"15\" border=\"0\"></td> @@ -356,7 +356,7 @@ if ( "$all_icons_disabled" eq "no" ) { print " - <tr height=\"15\"> + <tr style=\"height:15\"><td></td> </tr> <tr> <td width=\"28\" height=\"21\" valign=\"top\"> </td> @@ -370,7 +370,7 @@ <td width=\"28\" height=\"21\" valign=\"top\"> </td> <td valign=\"top\" colspan=\"4\" class=\"prefsPageHead\">Organization Chart Depth</td> </tr> - <tr height=\"10\"> + <tr style=\"height:10\"><td></td> </tr> <tr> <td width=\"35\" height=\"28\"></td> @@ -394,7 +394,7 @@ </select></td> <td width=\"350\" colspan=\"3\" class=\"prefsPageData\">  levels of organization depth</td> </tr> - <td height=\"30\"></td> + <tr style=\"height:30\"><td></td></tr> </table> </td> </tr> @@ -406,7 +406,7 @@ <td height=\"20\"> </td></tr> <tr> <td align=\"right\"><input type=\"button\" name=\"save\" value=\" Finished \" onClick=\"saveSettings();\"></td> - <td width=\"20\"</td> + <td width=\"20\"></td> <td><input type=\"button\" name=\"del_cookie\" value=\"Restore Defaults\" onClick=\"deleteCookie();\"></td> </tr> </table> Index: org.in =================================================================== RCS file: /cvs/dirsec/dsgw/orgbin/org.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- org.in 6 Mar 2008 22:00:39 -0000 1.6 +++ org.in 1 Apr 2008 20:10:11 -0000 1.7 @@ -364,6 +364,7 @@ # ########################################## +my $need_end_td_tag = 0; &draw_remaining_branches(); ########################################## @@ -374,11 +375,15 @@ # ########################################## -print "</TD></TR></TABLE></center>"; +if ($need_end_td_tag) { + print "</TD></TR></TABLE></center>"; +} + print "\n\n"; print "<BR><BR><HR>\n$fontstring"; print "Total number of reports shown above: " . $total . "\n</font><BR><BR><BR><BR><BR><BR><BR><BR>"; -print "</TD><TD NOWRAP>                                   </TD></TABLE></CENTER></BODY></HTML>\n"; +print "</TD></TR>\n"; +print "</TABLE></CENTER></BODY></HTML>\n"; exit; @@ -550,7 +555,7 @@ if ( ($visible eq "forefront") && (!($print_mode)) ) { print " <a href=\"$config_tokens{\"url-locator-base\"}"; - print "$locator\"><img src=\"@orguri@/mag.gif\" border=0 align=TEXTTOP></a>"; + print "$locator\"><img src=\"@orguri@/mag.gif\" border=0 align=\"top\"></a>"; } return; @@ -574,7 +579,7 @@ print " <a href=\"$config_tokens{'url-phonebook-base'}"; print "$dn\">"; - print "<img src=\"@orguri@/ldap-person.gif \" border=0 align=TEXTTOP>"; + print "<img src=\"@orguri@/ldap-person.gif \" border=0 align=\"top\">"; print "</a>"; } @@ -597,7 +602,7 @@ if ( ($visible eq "forefront") && ( $email =~ /@/ ) && (!($print_mode)) ) { print " <a href=\"mailto:$email\">"; - print "<img src=\"@orguri@/mail.gif \" border=0 align=TEXTTOP>"; + print "<img src=\"@orguri@/mail.gif \" border=0 align=\"top\">"; print "</a>"; } @@ -635,7 +640,7 @@ { $screenname =~ tr/ /+/; print " <a href=\"aim:goim?Screenname=$screenname\">"; - print "<img src=\"@orguri@/aim-online.gif\" border=0 align=TEXTTOP></a>"; + print "<img src=\"@orguri@/aim-online.gif\" border=0 align=\"top\"></a>"; } } @@ -774,7 +779,7 @@ sub print_javascript { -print "<SCRIPT> +print "<SCRIPT type=\"text/javascript\"> var left = 0; @@ -837,8 +842,8 @@ hideLayer(); finalhtml = '<TABLE border=1 CELLPADDING=15 BGCOLOR=\"#CCCCCC\"><TR><TD><TABLE BORDER=0>'; - finalhtml += '<TR><TD COLSPAN=2 NOWRAP>$fontstring<B>' + unescape(cn) + '</B></font></TD></TR>'; - finalhtml += '<TR><TD COLSPAN=2 NOWRAP>$fontstring' + title + '</font></TD></TR>'; + finalhtml += '<TR><TD COLSPAN=2 NOWRAP>$fontstring<B>' + unescape(cn) + '<\\/B><\\/font><\\/TD><\\/TR>'; + finalhtml += '<TR><TD COLSPAN=2 NOWRAP>$fontstring' + title + '<\\/font><\\/TD><\\/TR>'; finalhtml += '<TR><TD COLSPAN=2 NOWRAP>'; if ( (mail == '(none)') && (dn == '(none)') && (locator == '(none)') && (aimid == '(none)') ) @@ -850,47 +855,47 @@ finalhtml += '<HR>'; } - finalhtml += '</TD></TR>'; + finalhtml += '<\\/TD><\\/TR>'; if ( mail != '(none)' ) { finalhtml += '<TR><TD align=center><a href=\"mailto:' + mail + '\">'; - finalhtml += '<img src=\"@orguri@/mail.gif\" border=0 align=TEXTTOP></a></TD>'; + finalhtml += '<img src=\"@orguri@/mail.gif\" border=0 align=\"top\"><\\/a><\\/TD>'; finalhtml += '<TD NOWRAP>$fontstring    '; - finalhtml += '<a href=\"mailto:' + mail + '\">Email</a></font></TD></TR>'; + finalhtml += '<a href=\"mailto:' + mail + '\">Email<\\/a><\\/font><\\/TD><\\/TR>'; } if ( dn != '(none)' ) { finalhtml += '<TR><TD align=center>'; finalhtml += '<a href=\"$config_tokens{\"url-phonebook-base\"}'; - finalhtml += dn + '\"><img src=\"@orguri@/ldap-person.gif\" border=0 align=TEXTTOP></a></TD>'; + finalhtml += dn + '\"><img src=\"@orguri@/ldap-person.gif\" border=0 align=\"top\"><\\/a><\\/TD>'; finalhtml += '<TD NOWRAP>$fontstring    '; finalhtml += '<a href=\"$config_tokens{\"url-phonebook-base\"}' + dn + '\">'; - finalhtml += 'Phonebook</a></font></TD></TR>'; + finalhtml += 'Phonebook<\\/a><\\/font><\\/TD><\\/TR>'; } if ( locator != '(none)' ) { finalhtml += '<TR><TD align=center>'; finalhtml += '<a href=\"$config_tokens{\"url-locator-base\"}'; - finalhtml += locator + '\"><img src=\"@orguri@/mag.gif\" border=0 align=TEXTTOP></a></TD>'; + finalhtml += locator + '\"><img src=\"@orguri@/mag.gif\" border=0 align=\"top\"><\\/a><\\/TD>'; finalhtml += '<TD NOWRAP>$fontstring    '; finalhtml += '<a href=\"$config_tokens{\"url-locator-base\"}' + locator + '\">'; - finalhtml += 'Locator</a></font></TD></TR>'; + finalhtml += 'Locator<\\/a><\\/font><\\/TD><\\/TR>'; } if ( aimid != '(none)' ) { finalhtml += '<TR><TD align=center>'; finalhtml += '<a href=\"aim:goim?Screenname=' + aimid + '\">'; - finalhtml += '<img src=\"@orguri@/aim-online.gif\" border=0 align=TEXTTOP></a></TD>'; + finalhtml += '<img src=\"@orguri@/aim-online.gif\" border=0 align=\"top\"><\\/a><\\/TD>'; finalhtml += '<TD NOWRAP>$fontstring    '; finalhtml += '<a href=\"aim:goim?Screenname=' + aimid + '\">'; - finalhtml += 'Currently online</a></font></TD></TR>'; + finalhtml += 'Currently online<\\/a><\\/font><\\/TD><\\/TR>'; } - finalhtml += '</TABLE></TD></TR></TABLE>'; + finalhtml += '<\\/TABLE><\\/TD><\\/TR><\\/TABLE>'; if ( W3C ) @@ -1341,7 +1346,7 @@ } else { - $results[$anothertempnum][2] = "&nbsp"; + $results[$anothertempnum][2] = " "; } if ( $entry->{mail}[0] ne "" ) @@ -1353,7 +1358,7 @@ } else { - $results[$anothertempnum][3] = "&nbsp"; + $results[$anothertempnum][3] = " "; } if ( $entry->{businesscategory}[0] ne "" ) @@ -1362,7 +1367,7 @@ } else { - $results[$anothertempnum][4] = "&nbsp"; + $results[$anothertempnum][4] = " "; } @@ -1372,7 +1377,7 @@ } else { - $results[$anothertempnum][5] = "&nbsp"; + $results[$anothertempnum][5] = " "; } $lastentry = $entry; @@ -1407,14 +1412,14 @@ print " <br> -<table cellspacing=\"-1\" cellpadding=\"2\" border=\"0\" width=\"100%\"> +<table cellspacing=\"0\" cellpadding=\"2\" border=\"0\" width=\"100%\"> <tr> <td align=\"left\" class=\"pageHeader\">Search Results: $anothertempnum users</td> <td align=\"right\" class=\"searchHelp\"><img src=\"@orguri@/orgicon.gif\" width=\"16\" height=\"14\" border=\"0\"> = view organization chart</td> </tr> <tr><td> </td></tr> </table> -<table bgcolor=\"#FFFFFF\" cellspacing=\"-1\" cellpadding=\"3\" border=\"1\" width=\"100%\"> +<table bgcolor=\"#FFFFFF\" cellspacing=\"0\" cellpadding=\"3\" border=\"1\" width=\"100%\"> <tr> <th align=\"left\" class=\"resultsHeader\">Name</th> <th align=\"left\" class=\"resultsHeader\">Phone</th> @@ -1473,13 +1478,11 @@ # print "<font face=\"verdana, Arial, Helvetica, sans-serif\" style=\"font-size: 14px\">"; - print "<a href=\"org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($uid) . "&print=yes\" target=\"org_print_window\">Prepare this page for printing</A><BR>"; + print "<a href=\"org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($uid) . "&print=yes\" target=\"org_print_window\">Prepare this page for printing</A><BR>"; print "</font>"; } - print "<CENTER><table border=0><tr><td NOWRAP>"; - - print "<center>"; + print "<CENTER><table border=0><tr><td NOWRAP align=center>"; # # special exception: seems like when hardcopy printing org chart from IE browser, @@ -1492,16 +1495,16 @@ } else { - print "<table border=0 CELLSPACING=1 > \n"; + print "<table border=0 CELLSPACING=1 > \n"; } print "<tr>\n"; print "<td ALIGN=CENTER BGCOLOR=\"#000000\" NOWRAP>\n"; print "<table border=0 CELLSPACING=0 CELLPADDING=6 >\n"; print "<tr>\n"; - print "<td BGCOLOR=\"#CCCCCC\" ALIGN=CENTER VALIGN=CENTER NOWRAP>\n"; + print "<td BGCOLOR=\"#CCCCCC\" ALIGN=CENTER VALIGN=MIDDLE NOWRAP>\n"; print "<table cellspacing=0 border=0><tr><td NOWRAP>"; - print "$fontstring<center>"; + print "<center>$fontstring"; $tempstr = url_encode($entry->{dn}); $tempstr2 = url_encode($entry->{cn}[0]); @@ -1514,8 +1517,8 @@ if ( !($print_mode) ) { - print "\n\n <A HREF='javascript:return false;' target=_top onMouseOver=\"showLayer('$tempstr2','$title','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">"; - print "<img src=\"@orguri@/arrow.gif\" border=0 align=TEXTTOP>"; + print "\n\n <A HREF=\"javascript:return%20false;\" target=_top onMouseOver=\"showLayer('$tempstr2','$title','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">"; + print "<img src=\"@orguri@/arrow.gif\" border=0 align=\"top\">"; print "</A> \n"; } @@ -1559,8 +1562,8 @@ if ( !($print_mode) ) { - print "\n\n <A HREF='javascript:return false;' target=_top onMouseOver=\"showLayer('$tempstr2','$managertitle','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">"; - print "<img src=\"@orguri@/arrow.gif\" border=0 align=TEXTTOP>"; + print "\n\n <A HREF=\"javascript:return%20false;\" target=_top onMouseOver=\"showLayer('$tempstr2','$managertitle','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">"; + print "<img src=\"@orguri@/arrow.gif\" border=0 align=\"top\">"; print "</A> \n"; } @@ -1568,22 +1571,21 @@ if ( !($print_mode) ) { - print " <A HREF=org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($manager) . "><img src=\"@orguri@/orgicon.gif\" border=0 height=15 width=17 align=TEXTTOP></a>"; + print " <A HREF=org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($manager) . "><img src=\"@orguri@/orgicon.gif\" border=0 height=15 width=17 align=\"top\"></a>"; } print_aim_icon_if_outside_layer( $config_tokens{"icons-aim-visible"}, $managerEntry->{nsAIMStatusText}[0], $managerEntry->{nsaimid}[0] ); print_email_icon_if_outside_layer( $config_tokens{"icons-email-visible"}, $managerEntry->{mail}[0] ); print_pb_icon_if_outside_layer( $config_tokens{"icons-phonebook-visible"}, $tempstr ); print_locator_icon_if_outside_layer( $config_tokens{"icons-locator-visible"}, $tempstr2 ); - - print "</font>"; } if (!$managerEntry) { print "<B>(no manager listed)</B>"; } - + print "</font>"; + print"</center></td> </tr> </table> </td> </tr> </table> </td> </tr> </table> <BR>"; } @@ -1634,7 +1636,7 @@ if ( "$entry" ne "$nextentry" ) { print "$fontstring"; - print "\n<img SRC=\"@orguri@/new-branch-first.gif\" align=TEXTTOP>"; + print "\n<img SRC=\"@orguri@/new-branch-first.gif\" align=\"top\">"; $aimid = is_aimid_in_layer ( $config_tokens{"icons-aim-visible"} , "discover" , $sortedPeople[$tempnum][5] ); $emailstr = is_email_in_layer ( $config_tokens{"icons-email-visible"}, $sortedPeople[$tempnum][3] ); @@ -1643,8 +1645,8 @@ if ( !($print_mode) ) { - print "\n\n <A HREF='javascript:return false;' target=_top onMouseOver=\"showLayer('$sortedPeople[$tempnum][6]','$sortedPeople[$tempnum][4]','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">"; - print "<img src=\"@orguri@/arrow.gif\" border=0 align=TEXTTOP>"; + print "\n\n <A HREF=\"javascript:return%20false;\" target=_top onMouseOver=\"showLayer('$sortedPeople[$tempnum][6]','$sortedPeople[$tempnum][4]','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">"; + print "<img src=\"@orguri@/arrow.gif\" border=0 align=\"top\">"; print "</A> \n"; } @@ -1658,7 +1660,7 @@ # to the person's name, to indicate they have people below them. # print "<a href=org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($sortedPeople[$tempnum][1]) . ">"; - print "<img src=\"@orguri@/orgicon.gif\" border=0 height=15 width=17 align=TEXTTOP></a>"; + print "<img src=\"@orguri@/orgicon.gif\" border=0 height=15 width=17 align=\"top\"></a>"; } print_aim_icon_if_outside_layer( $config_tokens{"icons-aim-visible"}, "discover", $sortedPeople[$tempnum][5] ); @@ -1798,9 +1800,7 @@ sub draw_remaining_branches() { - - print "\n"; - print "<center><table border=0 cellpadding=10><tr VALIGN=top>"; + my $start_center_table_tr = "\n<center><table border=0 cellpadding=10><tr VALIGN=top>"; $current_indent = 1; $one_time_td = 0; @@ -1829,6 +1829,7 @@ { if ( $one_time_td == 0 ) { + print $start_center_table_tr; print "<TD NOWRAP>\n"; $one_time_td = 1; } @@ -1836,6 +1837,7 @@ { print "</TD><TD NOWRAP>\n"; } + $need_end_td_tag = 1; # have a begin TD tag, need to close it } @@ -1858,9 +1860,11 @@ print "<td ALIGN=CENTER BGCOLOR=\"#000000\">\n"; print "<table border=0 CELLSPACING=0 CELLPADDING=6 >\n"; print "<tr>\n"; - print "<td BGCOLOR=\"#CCCCCC\" ALIGN=CENTER VALIGN=CENTER>\n"; + print "<td BGCOLOR=\"#CCCCCC\" ALIGN=CENTER VALIGN=MIDDLE>\n"; print "<table cellspacing=0 border=0><tr><td NOWRAP><CENTER>"; + $need_end_td_tag = 1; # have a begin TD tag, need to close it + # # See comment just a few lines below about being careful on # not moving this font tag past the IMG SRC tags @@ -1881,25 +1885,25 @@ { for ( $anothertempnum = 0 ; $anothertempnum < $current_indent - 2 ; $anothertempnum++ ) { - print "<img SRC=\"@orguri@/new-branch-blank.gif\" align=TEXTTOP>"; + print "<img SRC=\"@orguri@/new-branch-blank.gif\" align=\"top\">"; } } else { for ( $anothertempnum = 0 ; $anothertempnum < $current_indent - 2 ; $anothertempnum++ ) { - print "<img SRC=\"@orguri@/new-branch-straight.gif\" align=TEXTTOP>"; + print "<img SRC=\"@orguri@/new-branch-straight.gif\" align=\"top\">"; } } if ( ("$sortedPeople[$tempnum][8]" eq "cc1") || ( $sortedPeople[$tempnum][8] =~ /rounded/ ) ) { - print "<img SRC=\"@orguri@/branch-cc1.gif\" align=TEXTTOP>"; + print "<img SRC=\"@orguri@/branch-cc1.gif\" align=\"top\">"; } else { - print "<img SRC=\"@orguri@/new-branch-first.gif\" align=TEXTTOP>"; + print "<img SRC=\"@orguri@/new-branch-first.gif\" align=\"top\">"; } } @@ -1911,8 +1915,8 @@ if ( !($print_mode) ) { - print "\n\n <A HREF='javascript:return false;' target=_top onMouseOver=\"showLayer('$sortedPeople[$tempnum][6]','$sortedPeople[$tempnum][4]','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">"; - print "<img src=\"@orguri@/arrow.gif\" border=0 align=TEXTTOP>"; + print "\n\n <A HREF=\"javascript:return%20false;\" target=_top onMouseOver=\"showLayer('$sortedPeople[$tempnum][6]','$sortedPeople[$tempnum][4]','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">"; + print "<img src=\"@orguri@/arrow.gif\" border=0 align=\"top\">"; print "</A> \n"; } @@ -1954,7 +1958,7 @@ if ( !( $sortedPeople[$tempnum+1][0] =~ /$tempdata[@tempdata-1]\/$/ ) ) { print "<a href=org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($sortedPeople[$tempnum][1]) . ">"; - print "<img src=\"@orguri@/orgicon.gif\" border=0 height=15 width=17 align=TEXTTOP></a>"; + print "<img src=\"@orguri@/orgicon.gif\" border=0 height=15 width=17 align=\"top\"></a>"; } } }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits April 2008