[Fedora-directory-commits] adminserver/admserv/schema/ldif tasks.ldif, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27187/adminserver/admserv/schema/ldif
Modified Files:
tasks.ldif
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: tasks.ldif
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/tasks.ldif,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tasks.ldif 9 Sep 2005 18:49:22 -0000 1.4
+++ tasks.ldif 21 Oct 2005 19:19:11 -0000 1.5
@@ -204,7 +204,7 @@
objectclass: nstask
objectclass: nsAdminObject
nshelpref: admin/monreplication.html
-nsexecref: perl?repl-monitor-cgi.pl
+nsexecref: repl-monitor-cgi.pl
# Top level Command branch
#
18 years, 7 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 Makefile, 1.6, 1.7 perl.c, 1.4, NONE
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27187/adminserver/admserv/cgi-src40
Modified Files:
Makefile
Removed Files:
perl.c
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile 26 Sep 2005 14:07:17 -0000 1.6
+++ Makefile 21 Oct 2005 19:19:11 -0000 1.7
@@ -63,7 +63,7 @@
RB_PROGS = admpw config dsconfig htmladmin listOldSrvs mergeConfig migrateConfig monreplication restartsrv sec-activate security $(SNMP_PROGS) stopsrv ugdsconfig viewdata viewlog
#Programs without Resource Bundles
-NO_RB_PROGS = perl statusping userinfo ReadLog statpingserv
+NO_RB_PROGS = statusping userinfo ReadLog statpingserv
#Target CGI programs
PROGS = $(NO_RB_PROGS) $(RB_PROGS)
@@ -509,13 +509,6 @@
# helpsrch.cpp /link /INCREMENTAL:no /SUBSYSTEM:console
#endif
-ifneq ($(ARCH), WINNT)
-$(BINDIR)/perl: perl.c
- cd $(BINDIR); \
- $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o perl \
- $(SRCDIR)/perl.c $
-endif
-
$(BINDIR)/%: %.sh
cp $*.sh $(BINDIR)/$*
--- perl.c DELETED ---
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_connection.c, 1.10, 1.11
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23088
Modified Files:
windows_connection.c
Log Message:
also checkin fix for 170350 onto trunk
Index: windows_connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_connection.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- windows_connection.c 6 Oct 2005 18:23:10 -0000 1.10
+++ windows_connection.c 21 Oct 2005 17:55:22 -0000 1.11
@@ -385,6 +385,7 @@
char *errmsg = NULL;
char **referrals = NULL;
char *matched = NULL;
+ char *ptr;
rc = ldap_parse_result(conn->ld, res, &err, &matched,
&errmsg, &referrals, &loc_returned_controls,
@@ -433,13 +434,34 @@
}
return_value = LDAP_SUCCESS == conn->last_ldap_error ? CONN_OPERATION_SUCCESS : CONN_OPERATION_FAILED;
}
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
- "%s: Received result code %d for %s operation %s%s\n",
- agmt_get_long_name(conn->agmt),
- conn->last_ldap_error,
- op_string == NULL ? "" : op_string,
- extra_op_string == NULL ? "" : extra_op_string,
- extra_op_string == NULL ? "" : " ");
+ /* remove extra newlines from AD error message */
+ for (ptr = errmsg; ptr && *ptr; ++ptr) {
+ if ((*ptr == '\n') || (*ptr == '\r')) {
+ *ptr = ' ';
+ }
+ }
+ /* handle special case of constraint violation - give admin
+ enough information to allow them to fix the problem
+ and retry - bug 170350 */
+ if (conn->last_ldap_error == LDAP_CONSTRAINT_VIOLATION) {
+ char ebuf[BUFSIZ];
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ "%s: Received error [%s] when attempting to %s"
+ " entry [%s]: Please correct the attribute specified "
+ "in the error message. Refer to the Windows Active "
+ "Directory docs for more information.\n",
+ agmt_get_long_name(conn->agmt),
+ errmsg, op_string == NULL ? "" : op_string,
+ escape_string(dn, ebuf));
+ } else {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
+ "%s: Received result code %d (%s) for %s operation %s%s\n",
+ agmt_get_long_name(conn->agmt),
+ conn->last_ldap_error, errmsg,
+ op_string == NULL ? "" : op_string,
+ extra_op_string == NULL ? "" : extra_op_string,
+ extra_op_string == NULL ? "" : " ");
+ }
/*
* XXXggood do I need to free matched, referrals,
* anything else? Or can I pass NULL for the args
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_connection.c, 1.8.2.2, 1.8.2.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21711/ldapserver/ldap/servers/plugins/replication
Modified Files:
Tag: Directory71RtmBranch
windows_connection.c
Log Message:
Bug(s) fixed: 170350
Bug Description: RHDS to AD: entries with constraint violations not sync'ed
Reviewed by: Nathan and Noriko (Thanks!)
Branch: Directory71RtmBranch and HEAD
Fix Description: The DS correctly rejects the change and continues when
it gets a constraint violation from Windows AD in response to an
update. However, there is no way for the admin to know that this
occurred, and no easy way to find out what the problem is or how to fix
it. This fix just logs the error message from Windows at the default
log level, so an admin can know which entry and attribute had a
problem. Other log messages are logged at the repl log level, as
before. The other part of this is to remove the extraneous new line
chars from the Windows error message.
Platforms tested: RHEL4
Flag Day: no
Doc impact: Yes. We need to document a way for the user to fix the
problem and then re-sync the entry over to Windows. We also need a link
to detailed information about AD error messages.
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: windows_connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_connection.c,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- windows_connection.c 6 Oct 2005 18:15:35 -0000 1.8.2.2
+++ windows_connection.c 21 Oct 2005 17:40:33 -0000 1.8.2.3
@@ -385,6 +385,7 @@
char *errmsg = NULL;
char **referrals = NULL;
char *matched = NULL;
+ char *ptr;
rc = ldap_parse_result(conn->ld, res, &err, &matched,
&errmsg, &referrals, &loc_returned_controls,
@@ -433,13 +434,34 @@
}
return_value = LDAP_SUCCESS == conn->last_ldap_error ? CONN_OPERATION_SUCCESS : CONN_OPERATION_FAILED;
}
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
- "%s: Received result code %d for %s operation %s%s\n",
- agmt_get_long_name(conn->agmt),
- conn->last_ldap_error,
- op_string == NULL ? "" : op_string,
- extra_op_string == NULL ? "" : extra_op_string,
- extra_op_string == NULL ? "" : " ");
+ /* remove extra newlines from AD error message */
+ for (ptr = errmsg; ptr && *ptr; ++ptr) {
+ if ((*ptr == '\n') || (*ptr == '\r')) {
+ *ptr = ' ';
+ }
+ }
+ /* handle special case of constraint violation - give admin
+ enough information to allow them to fix the problem
+ and retry - bug 170350 */
+ if (conn->last_ldap_error == LDAP_CONSTRAINT_VIOLATION) {
+ char ebuf[BUFSIZ];
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ "%s: Received error [%s] when attempting to %s"
+ " entry [%s]: Please correct the attribute specified "
+ "in the error message. Refer to the Windows Active "
+ "Directory docs for more information.\n",
+ agmt_get_long_name(conn->agmt),
+ errmsg, op_string == NULL ? "" : op_string,
+ escape_string(dn, ebuf));
+ } else {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
+ "%s: Received result code %d (%s) for %s operation %s%s\n",
+ agmt_get_long_name(conn->agmt),
+ conn->last_ldap_error, errmsg,
+ op_string == NULL ? "" : op_string,
+ extra_op_string == NULL ? "" : extra_op_string,
+ extra_op_string == NULL ? "" : " ");
+ }
/*
* XXXggood do I need to free matched, referrals,
* anything else? Or can I pass NULL for the args
18 years, 7 months
[Fedora-directory-commits] CVSROOT loginfo,1.7,1.8
by Doctor Conrad
Author: foxworth
Update of /cvs/dirsec/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14452
Modified Files:
loginfo
Log Message:
Removed mail recipient bonsai-checkin-daemon\(a)hurricane.sfbay.redhat.com from dolog.pl recipient list. Mail to alias was being bounced. Will add back later when problem is resolved.
Index: loginfo
===================================================================
RCS file: /cvs/dirsec/CVSROOT/loginfo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- loginfo 17 Oct 2005 18:43:07 -0000 1.7
+++ loginfo 20 Oct 2005 18:48:52 -0000 1.8
@@ -26,4 +26,4 @@
# or
#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} cvsdirsec(a)fedora.redhat.com
-ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/dirsec localdelivery(a)cvs-int.fedora.redhat.com bonsai-checkin-daemon(a)hurricane.sfbay.redhat.com
+ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/dirsec localdelivery(a)cvs-int.fedora.redhat.com
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.4, 1.1.2.5 redhat-patch.inf, 1.1.2.4, 1.1.2.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14056
Modified Files:
Tag: Directory71RtmBranch
fedora-patch.inf redhat-patch.inf
Log Message:
Removing ntds.msi from the patch list since there is no fixes going into DS7.1SP1.
Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- fedora-patch.inf 28 Sep 2005 22:47:13 -0000 1.1.2.4
+++ fedora-patch.inf 20 Oct 2005 18:11:23 -0000 1.1.2.5
@@ -54,7 +54,6 @@
file: 165640: lib/views-plugin.*
file: 167478,160589: setup/setup
file: 156120,159037: winsync/PassSync.msi
-file: 156120,159037: winsync/ntds.msi
file: 167761: java/jars/ds71.jar
file: 169388: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- redhat-patch.inf 28 Sep 2005 22:47:13 -0000 1.1.2.4
+++ redhat-patch.inf 20 Oct 2005 18:11:23 -0000 1.1.2.5
@@ -54,7 +54,6 @@
file: 165640: lib/views-plugin.*
file: 167478,160589: setup/setup
file: 156120,159037: winsync/PassSync.msi
-file: 156120,159037: winsync/ntds.msi
file: 167761: java/jars/ds71.jar
file: 169388: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_protocol_util.c, 1.20.2.1, 1.20.2.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12443
Modified Files:
Tag: Directory71RtmBranch
windows_protocol_util.c
Log Message:
170071 - Automatically add grouptype for new groups being synchd to NT4
Index: windows_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- windows_protocol_util.c 28 Sep 2005 20:27:53 -0000 1.20.2.1
+++ windows_protocol_util.c 20 Oct 2005 17:25:22 -0000 1.20.2.2
@@ -1362,6 +1362,19 @@
vs = NULL;
}
}
+ /* NT4 must have the groupType attribute set for groups. If it is not present, we will
+ * add it here with a value of 2 (global group).
+ */
+ if (is_nt4 && is_group)
+ {
+ Slapi_Attr *ap = NULL;
+ if(slapi_entry_attr_find(new_entry, "groupType", &ap))
+ {
+ /* groupType attribute wasn't found, so we'll add it */
+ slapi_entry_attr_set_int(new_entry, "groupType", 2 /* global group */);
+ }
+ }
+
if (remote_entry)
{
*remote_entry = new_entry;
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_protocol_util.c, 1.21, 1.22
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12369/ldap/servers/plugins/replication
Modified Files:
windows_protocol_util.c
Log Message:
170071 - Automatically add grouptype for new groups being synchd to NT4
Index: windows_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- windows_protocol_util.c 28 Sep 2005 20:21:20 -0000 1.21
+++ windows_protocol_util.c 20 Oct 2005 17:12:16 -0000 1.22
@@ -1362,6 +1362,19 @@
vs = NULL;
}
}
+ /* NT4 must have the groupType attribute set for groups. If it is not present, we will
+ * add it here with a value of 2 (global group).
+ */
+ if (is_nt4 && is_group)
+ {
+ Slapi_Attr *ap = NULL;
+ if(slapi_entry_attr_find(new_entry, "groupType", &ap))
+ {
+ /* groupType attribute wasn't found, so we'll add it */
+ slapi_entry_attr_set_int(new_entry, "groupType", 2 /* global group */);
+ }
+ }
+
if (remote_entry)
{
*remote_entry = new_entry;
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/ntds/apacheds usersync.schema, 1.3, 1.4
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/ntds/apacheds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12369/ldap/servers/ntds/apacheds
Modified Files:
usersync.schema
Log Message:
170071 - Automatically add grouptype for new groups being synchd to NT4
Index: usersync.schema
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/ntds/apacheds/usersync.schema,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- usersync.schema 13 May 2005 03:20:11 -0000 1.3
+++ usersync.schema 20 Oct 2005 17:12:15 -0000 1.4
@@ -522,7 +522,6 @@
isCriticalSystemObject $
member $
name $
- groupType $
showInAdvancedViewOnly $
systemFlags $
objectCategory $
18 years, 7 months
[Fedora-directory-commits] CVSROOT loginfo,1.6,1.7
by Doctor Conrad
Author: foxworth
Update of /cvs/dirsec/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19438
Modified Files:
loginfo
Log Message:
Updated loginfo checkin notification to include bonsai-checkin-daemon\(a)hurricane.sfbay.redhat.com. This will allow updates to DirSec's local Bonsai server as well as Fedora CVS's bonsai server.
Index: loginfo
===================================================================
RCS file: /cvs/dirsec/CVSROOT/loginfo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- loginfo 1 Jun 2005 16:47:38 -0000 1.6
+++ loginfo 17 Oct 2005 18:43:07 -0000 1.7
@@ -26,4 +26,4 @@
# or
#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} cvsdirsec(a)fedora.redhat.com
-ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/dirsec localdelivery(a)cvs-int.fedora.redhat.com
+ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/dirsec localdelivery(a)cvs-int.fedora.redhat.com bonsai-checkin-daemon(a)hurricane.sfbay.redhat.com
18 years, 7 months