[Fedora-directory-commits] adminutil adminutil.spec, 1.6, 1.7 configure, 1.8, 1.9 configure.ac, 1.5, 1.6 aclocal.m4, 1.8, 1.9 missing, 1.7, 1.8 install-sh, 1.7, 1.8 Makefile.in, 1.8, 1.9 depcomp, 1.7, 1.8 config.sub, 1.7, 1.8 config.guess, 1.7, 1.8 compile, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29556/adminutil
Modified Files:
adminutil.spec configure configure.ac aclocal.m4 missing
install-sh Makefile.in depcomp config.sub config.guess compile
Log Message:
bump version to 1.1.2
Index: adminutil.spec
===================================================================
RCS file: /cvs/dirsec/adminutil/adminutil.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- adminutil.spec 25 May 2007 22:55:54 -0000 1.6
+++ adminutil.spec 22 Jun 2007 22:51:00 -0000 1.7
@@ -6,8 +6,8 @@
Summary: Utility library for directory server administration
Name: adminutil
-Version: 1.1.1
-Release: 3%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
License: LGPL
URL: http://directory.fedoraproject.org/wiki/AdminUtil
Group: Development/Libraries
@@ -84,6 +84,11 @@
%{_includedir}/libadmsslutil
%changelog
+* Fri Jun 22 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.2-1
+- Updated version to 1.1.2
+- This version fixes some memory leaks and invalid memory use
+- issues
+
* Wed May 23 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.1-3
- more fedora review stuff - use macros consistently
- make sure install preserves timestamps
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminutil/configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure 22 Jun 2007 21:06:44 -0000 1.8
+++ configure 22 Jun 2007 22:51:00 -0000 1.9
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for adminutil 1.1.1.
+# Generated by GNU Autoconf 2.59 for adminutil 1.1.2.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='adminutil'
PACKAGE_TARNAME='adminutil'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='adminutil 1.1.1'
+PACKAGE_VERSION='1.1.2'
+PACKAGE_STRING='adminutil 1.1.2'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -954,7 +954,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 adminutil 1.1.1 to adapt to many kinds of systems.
+\`configure' configures adminutil 1.1.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of adminutil 1.1.1:";;
+ short | recursive ) echo "Configuration of adminutil 1.1.2:";;
esac
cat <<\_ACEOF
@@ -1180,7 +1180,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-adminutil configure 1.1.1
+adminutil configure 1.1.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1194,7 +1194,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by adminutil $as_me 1.1.1, which was
+It was created by adminutil $as_me 1.1.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1837,7 +1837,7 @@
# Define the identity of the package.
PACKAGE='adminutil'
- VERSION='1.1.1'
+ VERSION='1.1.2'
cat >>confdefs.h <<_ACEOF
@@ -24367,7 +24367,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by adminutil $as_me 1.1.1, which was
+This file was extended by adminutil $as_me 1.1.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24425,7 +24425,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-adminutil config.status 1.1.1
+adminutil config.status 1.1.2
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/adminutil/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.ac 21 Jun 2007 21:28:00 -0000 1.5
+++ configure.ac 22 Jun 2007 22:51:01 -0000 1.6
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([adminutil], [1.1.1], [http://bugzilla.redhat.com/])
+AC_INIT([adminutil], [1.1.2], [http://bugzilla.redhat.com/])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
16 years, 10 months
[Fedora-directory-commits] mod_admserv mod_admserv.c, 1.30, 1.31 mod_admserv.h, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28739/mod_admserv
Modified Files:
mod_admserv.c mod_admserv.h
Log Message:
Resolves: bug 245369
Bug Description: mod_admserv: Task cache refresh uses wrong credentials
Reviewed by: nkinder (Thanks!)
Fix Description: When the user requests a Task url, the admin server first
figures out which server instance (or product) the request is for, then checks
to see if it has seen that server or product before. If not, it uses the
function sync_task_sie_data() to read the task data from the SIEs and ISIEs.
However, it needs to use the credentials of the currently authenticated user
to do so, because the tasks are protected by ACIs, and the user should only be
allowed to read those tasks the user has access to. The interface to read
these tasks is not great. It expects the SIE is a user with a password, and
it attempts to bind as that user, instead of the currently authenticated user.
I had to hack it to force it to use the current userdn and password instead
of the SIE DN and SIE password.
The SIE DN and password are now deprecated for binding. There were a couple
of places where the SIE was used for both the bind DN and the SIE DN. I've
created another structure member for the admservSieDN for use as the SIE (the
configuration base DN) instead of as a bind DN, and deprecated the use of the
SIE as the bind DN elsewhere in the code.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: mod_admserv.c
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mod_admserv.c 19 Jun 2007 23:31:12 -0000 1.30
+++ mod_admserv.c 22 Jun 2007 22:37:46 -0000 1.31
@@ -758,7 +758,7 @@
and will set up all of the TLS/SSL stuff */
/* if we are acting as simply a TLS/SSL client to the directory server,
we still have to perform our own TLS/SSL client init */
- if (ADMSSL_Init(info, configdir, 0)) {
+ if (ADMSSL_Init(info, (char *)configdir, 0)) {
ap_log_error(APLOG_MARK, APLOG_CRIT, 0 /* status */, NULL,
"sslinit: NSS is required to use LDAPS, but security initialization failed. Cannot start server");
exit(1);
@@ -816,6 +816,7 @@
userGroupServer.port = 0;
userGroupServer.secure = 0;
userGroupServer.baseDN = NULL;
+ userGroupServer.admservSieDN = NULL;
if (NULL == admldapGetLDAPHndl(info)) {
/* LDAP is not available; gather info from the cache */
@@ -1035,6 +1036,7 @@
return DONE;
}
+
static int
sync_task_sie_data(const char *name, char *query, void *arg, request_rec *r)
{
@@ -1046,7 +1048,8 @@
int servercnt, i;
UserCacheEntry *cache_entry = NULL;
char *siedn = NULL;
- char *passwd = NULL;
+ const char *userdn = apr_table_get(r->notes, RQ_NOTES_USERDN);
+ const char *passwd = apr_table_get(r->notes, RQ_NOTES_USERPW);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
"sync_task_sie_data: getting ldap info for [%s]",
@@ -1062,22 +1065,24 @@
siedn = admldapGetSIEDN(ldapInfo);
task_register_server(ADMIN_SERVER_ID, siedn);
- PL_strfree(siedn);
- passwd = admldapGetSIEPWD(ldapInfo);
+ /* HACK HACK HACK */
+ /* getServerDNListSSL uses the siedn as the binddn - so we temporarily
+ replace the siedn with the userdn - fortunately it doesn't use the
+ siedn as the SIE DN */
+ admldapSetSIEDN(ldapInfo, userdn);
if (NULL == passwd) { /* use the passwd in cache if possible */
- char *userdn = admldapGetUserDN(ldapInfo, NULL);
cache_entry = (UserCacheEntry*)HashTableFind(auth_users, userdn);
if (cache_entry) {
- admSetCachedSIEPWD(cache_entry->userPW);
+ passwd = cache_entry->userPW;
}
- PL_strfree(userdn);
- } else {
- PL_strfree(passwd);
}
-
+ admSetCachedSIEPWD(passwd);
serverlist = getServerDNListSSL(ldapInfo);
+ /* HACK HACK HACK - reset after getServerDNListSSL */
+ admldapSetSIEDN(ldapInfo, siedn);
+
servercnt=0;
if (serverlist) {
while (serverlist[servercnt]) servercnt++;
@@ -1086,19 +1091,15 @@
for (i=0; i < servercnt; i++) {
/* Create Pset for each individual server */
char *host = admldapGetHost(ldapInfo);
- char *siedn = admldapGetSIEDN(ldapInfo);
- char *siepwd = admldapGetSIEPWD(ldapInfo);
tmp = psetRealCreateSSL(host,
admldapGetPort(ldapInfo),
admldapGetSecurity(ldapInfo),
serverlist[i],
- siedn,
- siepwd,
+ (char *)userdn,
+ (char *)passwd,
NULL,
&errorCode);
PL_strfree(host);
- PL_strfree(siedn);
- PL_strfree(siepwd);
if (tmp) {
# define SERVER_ID_ATTRIBUTE (char*)"nsServerID"
@@ -1136,6 +1137,11 @@
/* DT 02/02/98
* Register installed product tasks
*/
+ /* HACK HACK HACK */
+ /* getInstalledServerDNListSSL uses the siedn as the binddn - so we temporarily
+ replace the siedn with the userdn - fortunately it doesn't use the
+ siedn as the SIE DN */
+ admldapSetSIEDN(ldapInfo, userdn);
if ((installlist = getInstalledServerDNListSSL(ldapInfo))) {
int ii = 0;
while (installlist[ii]) {
@@ -1149,13 +1155,15 @@
}
deleteAttributeList(installlist);
}
+ /* HACK HACK HACK - reset after getInstalledServerDNListSSL */
+ admldapSetSIEDN(ldapInfo, siedn);
+ PL_strfree(siedn);
destroyAdmldap(ldapInfo);
return TRUE;
}
-static int update_ds(char *admroot, char *pwd, request_rec *r);
static int update_admpwd(char *admroot, char *newuid, char *newpw);
static int update_adm_conf(char *admroot, char *newpw);
@@ -1231,7 +1239,6 @@
ldapURL = formLdapURL(®istryServer, r->pool);
create_auth_users_cache_entry(uid, (char *)userDN, password, ldapURL);
- registryServer.bindPW = password;
rval = 1;
bailout:
closeLDAPConnection(ld);
@@ -1253,7 +1260,6 @@
char inbuf[BIG_LINE];
char outbuf[64]; /* needs at least 36 bytes */
char *origpw = (char *)apr_table_get(r->notes, RQ_NOTES_USERPW);
- int ds_done = 0;
int admpwd_done = 0;
apr_snprintf(filename, sizeof(filename), "%s/admpw", configdir);
@@ -1286,12 +1292,6 @@
uid = inbuf; *col=0; pw=col+1;
- if (!update_ds(configdir, newpw, r)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
- "failed to update siepwd on DS");
- return 0;
- }
- ds_done = 1;
apr_sha1_base64(newpw, strlen(newpw), outbuf);
if (!update_admpwd(configdir, uid, outbuf)) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
@@ -1309,9 +1309,6 @@
return 1;
recover:
- if (ds_done) {
- update_ds(configdir, origpw, r);
- }
if (admpwd_done) {
apr_sha1_base64(origpw, strlen(origpw), outbuf);
update_admpwd(configdir, uid, outbuf);
@@ -1354,64 +1351,6 @@
return 1;
}
-/*
- * Modify userpassword in the DS
- */
-static int
-update_ds(char *admroot, char *pwd, request_rec *r)
-{
- int errorCode;
- PsetHndl pset;
- const char *binddn = 0;
- const char *bindpw = 0;
- AdmldapInfo ldapInfo = NULL;
-
- /* Initialize the pset */
-
- ldapInfo = admldapBuildInfo(admroot, &errorCode);
-
- if (!ldapInfo) {
- ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r,
- "AdmInit: Failed to read data from adm.conf");
- return 0;
- }
-
- if (admldapGetSecurity(ldapInfo)) {
- sslinit(ldapInfo, admroot);
- }
-
- destroyAdmldap(ldapInfo);
-
- binddn = apr_table_get(r->notes, RQ_NOTES_USERDN);
- bindpw = apr_table_get(r->notes, RQ_NOTES_USERPW);
-
- pset = psetCreateSSL((char*)"admin-serv",
- admroot,
- (char*)binddn,
- (char*)bindpw,
- &errorCode);
-
- if (pset) {
- } else {
- ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r,
- "PSET Creation Failed for binddn [%s], err=%d",
- binddn, errorCode);
- return 0;
- }
-
- errorCode = psetSetSingleValueAttr(pset, (char*)"userpassword", pwd);
- psetDelete(pset);
- pset = NULL;
-
- if (errorCode) {
- ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r,
- "PSET Set Failed for attribute userpassword, err=%d",
- errorCode);
- return 0;
- }
- return 1;
-}
-
static void
populate_tasks_from_server(char *serverid, const void *sieDN, void *userdata)
{
@@ -1434,8 +1373,8 @@
return;
}
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
- "populate_tasks_from_server(): Opened new LDAPConnection to [%s:%d] user [%s]",
- registryServer.host, registryServer.port, registryServer.bindDN);
+ "populate_tasks_from_server(): Opened new LDAPConnection to [%s:%d]",
+ registryServer.host, registryServer.port);
data->server = server;
}
@@ -1542,6 +1481,8 @@
int ldapError;
char entryDN[LINE_LENGTH];
char *p;
+ char *siedn; /* this is looked up from the serverid, which is
+ extracted from the uri */
LDAP *server;
const char *userdn;
const char *pw;
@@ -1578,14 +1519,14 @@
saveduri = apr_pstrdup(r->pool, uri);
*p = '\0';
- if (!(p = (char*)HashTableFind(servers, serverid))) {
+ if (!(siedn = (char*)HashTableFind(servers, serverid))) {
/* DT 4/6/98 -- If we're seeing a serverid for the first time, then we try to do
* a resync to pull in new data for the serverid. If it still fails,
* then the client is out of luck. */
- admserv_runtime_command_exec(RUNTIME_RESYNC_COMMAND, NULL, NULL);
+ admserv_runtime_command_exec(RUNTIME_RESYNC_COMMAND, r->args, r);
- if (!(p = (char*)HashTableFind(servers, serverid))) {
+ if (!(siedn = (char*)HashTableFind(servers, serverid))) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
"admserv_check_authz(): unable to find registered server (%s)",
serverid);
@@ -1601,7 +1542,7 @@
return OK;
}
- if (!build_full_DN(&storage, entryDN+LINE_LENGTH, uri, p)) {
+ if (!build_full_DN(&storage, entryDN+LINE_LENGTH, uri, siedn)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
"admserv_check_authz(): unable to build DN from URL - bad URL [%s]",
uri);
@@ -2264,8 +2205,9 @@
registryServer.port = (admldapGetPort(info) < 0) ? 389 : admldapGetPort(info);
registryServer.secure = (admldapGetSecurity(info)) ? 1 : 0;
registryServer.baseDN = admldapGetBaseDN(info);
- registryServer.bindDN = admldapGetSIEDN(info);
- registryServer.bindPW = admldapGetSIEPWD(info);
+ registryServer.bindDN = ""; /* deprecated - use user credentials */
+ registryServer.bindPW = ""; /* deprecated - use user credentials */
+ registryServer.admservSieDN = admldapGetSIEDN(info);
destroyAdmldap(info);
info = NULL;
@@ -2283,7 +2225,7 @@
}
/* Register the admin server tasks */
- task_register_server(ADMIN_SERVER_ID, registryServer.bindDN);
+ task_register_server(ADMIN_SERVER_ID, registryServer.admservSieDN);
/* Populate the auth_tasks cache for the Local Admin */
@@ -2326,7 +2268,7 @@
TaskCacheEntry *cache_entry;
if (!build_full_DN(&storage, startds+LINE_LENGTH, uri,
- registryServer.bindDN)) {
+ registryServer.admservSieDN)) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server,
"mod_admserv_post_config: unable to build DN from URL - bad URL [%s]",
uri?uri:"none");
@@ -2496,7 +2438,7 @@
ap_rprintf(r, "ldapPort: %d\n", registryServer.port);
ap_rprintf(r, "ldapSecurity: %s\n", (registryServer.secure == 1) ? "on" : "off");
ap_rprintf(r, "ldapBaseDN: %s\n", registryServer.baseDN);
- ap_rprintf(r, "SIE: %s\n", registryServer.bindDN);
+ ap_rprintf(r, "SIE: %s\n", registryServer.admservSieDN);
ap_rputs("NMC_Status: 0\n", r);
return OK;
@@ -2532,7 +2474,9 @@
{
closeLDAPConnection(server);
ap_log_rerror(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, r,
- "unable to bind to server [%s:%d] as [%s]", data->host, data->port, data->bindDN); /*i18n*/
+ "unable to bind to server [%s:%d] as [%s]",
+ data->host, data->port,
+ (data->bindDN && *data->bindDN) ? data->bindDN : "(anonymous)"); /*i18n*/
return DECLINED;
}
@@ -2545,15 +2489,16 @@
tries = 0;
do {
- ldapError = ldapu_find_userdn(server, user, baseDN ? baseDN : data->baseDN, &userdn);
+ /* first try the basedn in the ldap server data, then the basedn param as a fallback */
+ ldapError = ldapu_find_userdn(server, user, data->baseDN ? data->baseDN : baseDN, &userdn);
if(ldapError != LDAP_SERVER_DOWN && ldapError != LDAP_CONNECT_ERROR)
break;
closeLDAPConnection(server);
if(!(server = openLDAPConnection(data)))
ap_log_rerror(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, r,
- "unable to find user [%s] in server [%s:%d]",
- user, data->host, data->port);
+ "unable to find user [%s] in server [%s:%d] under base DN [%s]",
+ user, data->host, data->port, data->baseDN ? data->baseDN : baseDN);
return DECLINED;
} while (server != NULL && ++tries < 2);
Index: mod_admserv.h
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_admserv.h 15 Nov 2006 21:31:40 -0000 1.4
+++ mod_admserv.h 22 Jun 2007 22:37:46 -0000 1.5
@@ -131,9 +131,12 @@
char *host;
int port;
int secure; /* track whether the server is running in secure mode */
- char *baseDN;
- char *bindDN;
- char *bindPW;
+ char *baseDN; /* for the config ds, usually o=NetscapeRoot
+ for the user/group ds, this is the default
+ suffix e.g. dc=example,dc=com */
+ char *bindDN; /* deprecated since the SIE cannot bind anymore */
+ char *bindPW; /* deprecated since the SIE cannot bind anymore */
+ char *admservSieDN; /* SIE DN of this admin server */
} LdapServerData;
typedef struct ServletLookupData {
16 years, 10 months
[Fedora-directory-commits] adminserver/admserv/schema/ldif 01nsroot.ldif.tmpl, 1.4, 1.5 02globalpreferences.ldif.tmpl, 1.3, 1.4 10dsdata.ldif.tmpl, 1.5, 1.6 20asdata.ldif.tmpl, 1.3, 1.4
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25618/admserv/schema/ldif
Modified Files:
01nsroot.ldif.tmpl 02globalpreferences.ldif.tmpl
10dsdata.ldif.tmpl 20asdata.ldif.tmpl
Log Message:
Resolves: #244749
Summary: Configure Pass Thru Auth (comment #12, #13)
Description: 1) Adding timestamp for installationTimeStamp.
2) some more ACIs are being added.
Index: 01nsroot.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/01nsroot.ldif.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 01nsroot.ldif.tmpl 21 Jun 2007 22:01:52 -0000 1.4
+++ 01nsroot.ldif.tmpl 22 Jun 2007 22:26:25 -0000 1.5
@@ -84,6 +84,19 @@
objectClass: top
objectClass: organizationalUnit
ou: UserPreferences
+aci: (targetattr = "*")(version 3.0; acl "Allow saving of User Preferences"; allow (add) userdn = "ldap:///all";)
+
+dn: ou="uid=%as_uid%, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot",ou=UserPreferences, ou=%domain%, o=NetscapeRoot
+objectClass: top
+objectClass: organizationalUnit
+aci: (targetattr=*)(version 3.0; acl "UserDNControl"; allow (all) userdnattr="creatorsname";)
+ou: uid=%as_uid%, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot
+
+dn: ou="cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot",ou=UserPreferences, ou=%domain%, o=NetscapeRoot
+objectClass: top
+objectClass: organizationalUnit
+aci: (targetattr=*)(version 3.0; acl "UserDNControl"; allow (all) userdnattr="creatorsname";)
+ou: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=netscaperoot
dn: cn=%fqdn%, ou=%domain%, o=NetscapeRoot
objectClass: top
Index: 02globalpreferences.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/02globalpreferences.ldif.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 02globalpreferences.ldif.tmpl 21 Jun 2007 22:01:52 -0000 1.3
+++ 02globalpreferences.ldif.tmpl 22 Jun 2007 22:26:25 -0000 1.4
@@ -101,6 +101,7 @@
objectClass: top
objectClass: nsAdminConsoleUser
cn: PublicViews
+aci: (targetattr = "*")(version 3.0; acl "Allow Authenticated Users to Save Public Views"; allow (all) userdn = "ldap:///all";)
dn: cn=CustomView, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
objectClass: top
Index: 10dsdata.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/10dsdata.ldif.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 10dsdata.ldif.tmpl 21 Jun 2007 22:01:52 -0000 1.5
+++ 10dsdata.ldif.tmpl 22 Jun 2007 22:26:25 -0000 1.6
@@ -33,6 +33,7 @@
nsBuildNumber: %ds_buildnum%
nsVendor: %vendor%
nsInstalledLocation: %ds_installedlocation%
+installationTimeStamp: %timestamp%
nsExpirationDate: 0
nsBuildSecurity: domestic
uniqueMember: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
@@ -55,11 +56,14 @@
nsSecureServerPort: %ds_secure_port%
serverProductName: Directory Server (%dsid%)
serverVersionNumber: %ds_version%
+installationTimeStamp: %timestamp%
nsSuiteSpotUser: %ds_user%
serverHostName: %fqdn%
cn: slapd-%dsid%
uniqueMember: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
uniqueMember: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+aci: (targetattr=*)(version 3.0; acl "Enable delegated access"; allow (read, search, compare) groupdn="ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
+aci: (targetattr="uniquemember || serverProductName || userpassword || description")(targetfilter=(objectclass=netscapeServer))(version 3.0; acl "Enable access delegation"; allow (write) groupdn="ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
dn: cn=configuration,cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
objectClass: nsResourceRef
@@ -70,4 +74,16 @@
nsClassname: com.netscape.admin.dirserv.DSAdmin@%ds_console_jar%@cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
nsJarfilename: @ds_console_jar@
nsDirectoryInfoRef: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+aci: (targetattr=*)(version 3.0; acl "Enable Server configuration"; allow (all) groupdn="ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
+dn: ou="cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot",ou=UserPreferences, ou=%domain%, o=NetscapeRoot
+objectClass: top
+objectClass: organizationalUnit
+aci: (targetattr=*)(version 3.0; acl "UserDNControl"; allow (all) userdnattr="creatorsname";)
+ou: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+
+dn: ou="%rootdn%",ou=UserPreferences, ou=sfbay.redhat.com, o=NetscapeRoot
+objectClass: top
+objectClass: organizationalUnit
+aci: (targetattr=*)(version 3.0; acl "UserDNControl"; allow (all) userdnattr="creatorsname";)
+ou: %rootdn%
Index: 20asdata.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/20asdata.ldif.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 20asdata.ldif.tmpl 20 Jun 2007 23:50:11 -0000 1.3
+++ 20asdata.ldif.tmpl 22 Jun 2007 22:26:25 -0000 1.4
@@ -28,10 +28,11 @@
nsProductVersion: %as_version%
nsBuildNumber: %as_buildnum%
nsInstalledLocation: %as_installedlocation%
+installationTimeStamp: %timestamp%
nsBuildSecurity: domestic
nsServerMigrationClassname: com.netscape.management.admserv.AdminServerProduct@%as_console_jar%
uniqueMember: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-aci: (targetattr=*)(targetfilter=(nsNickName=*))(version 3.0; acl "Enable delegated access"; allow (read, search, compare) groupdn="ldap:///cn=%brand% Admin istration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
+aci: (targetattr=*)(targetfilter=(nsNickName=*))(version 3.0; acl "Enable delegated access"; allow (read, search, compare) groupdn="ldap:///cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
dn: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
objectClass: top
@@ -44,9 +45,10 @@
serverRoot: %as_serverroot%
serverProductName: Administration Server
serverHostName: %fqdn%
+installationTimeStamp: %timestamp%
uniqueMember: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
aci: (targetattr=*)(version 3.0; acl "Enable delegated access"; allow (read, search, compare) groupdn="ldap:///cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
-aci: (targetattr="uniquemember || serverProductName || administratorContactInfo || userpassword || description")(targetfilter=(objectclass=netscapeServer))(version 3.0; acl "Enable access delegation"; allow (write) groupdn="ldap:///cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
+aci: (targetattr="uniquemember || serverProductName || userpassword || description")(targetfilter=(objectclass=netscapeServer))(version 3.0; acl "Enable access delegation"; allow (write) groupdn="ldap:///cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
dn: cn=configuration, cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
objectClass: nsConfig
@@ -73,4 +75,3 @@
nsClassname: com.netscape.management.admserv.AdminServer@%as_console_jar%@cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
aci: (targetattr=*)(version 3.0; acl "Enable delegated admin to access configuration"; allow (read, search) groupdn="ldap:///cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
aci: (targetattr=*)(version 3.0; acl "Enable Server configuration"; allow (all) groupdn="ldap:///cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
-
16 years, 10 months
[Fedora-directory-commits] adminserver/admserv/newinst/src adminserver.map.in, 1.2, 1.3 dirserver.map.in, 1.2, 1.3 register_param.map.in, 1.2, 1.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25618/admserv/newinst/src
Modified Files:
adminserver.map.in dirserver.map.in register_param.map.in
Log Message:
Resolves: #244749
Summary: Configure Pass Thru Auth (comment #12, #13)
Description: 1) Adding timestamp for installationTimeStamp.
2) some more ACIs are being added.
Index: adminserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/adminserver.map.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- adminserver.map.in 21 Jun 2007 22:01:51 -0000 1.2
+++ adminserver.map.in 22 Jun 2007 22:26:24 -0000 1.3
@@ -59,6 +59,7 @@
normbrand = NormBrand
hostname = `use Net::Domain qw(hostname); $returnvalue = hostname();`
vendor = Vendor
+timestamp = `use Time::gmtime; my $gm = gmtime; $returnvalue = sprintf ("%04d%02d%02d%02d%02d%02dZ", 1900+$gm->year, 1+$gm->mon, $gm->mday, $gm->hour, $gm->min, $gm->sec);`
asid = `use Net::Domain qw(hostname); $returnvalue = hostname();`
as_port = Port
Index: dirserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/dirserver.map.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dirserver.map.in 21 Jun 2007 22:01:51 -0000 1.2
+++ dirserver.map.in 22 Jun 2007 22:26:24 -0000 1.3
@@ -58,6 +58,7 @@
brand = Brand
normbrand = NormBrand
vendor = Vendor
+timestamp = `use Time::gmtime; my $gm = gmtime; $returnvalue = sprintf ("%04d%02d%02d%02d%02d%02dZ", 1900+$gm->year, 1+$gm->mon, $gm->mday, $gm->hour, $gm->min, $gm->sec);`
configroot = "CONFIG ROOT -- replace me"
asid = `use Net::Domain qw(hostname); $returnvalue = hostname();`
Index: register_param.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- register_param.map.in 21 Jun 2007 22:01:51 -0000 1.2
+++ register_param.map.in 22 Jun 2007 22:26:24 -0000 1.3
@@ -62,6 +62,7 @@
uname_a = `open(UNAMEA, "uname -a |"); $returnvalue = <UNAMEA>; chomp $returnvalue; close(UNAMEA);`
uname_m = `open(UNAMEM, "uname -m |"); $returnvalue = <UNAMEM>; chomp $returnvalue; close(UNAMEM);`
configroot = "CONFIG ROOT -- replace me"
+timestamp = `use Time::gmtime; my $gm = gmtime; $returnvalue = sprintf ("%04d%02d%02d%02d%02d%02dZ", 1900+$gm->year, 1+$gm->mon, $gm->mday, $gm->hour, $gm->min, $gm->sec);`
as_uid = ServerAdminID
as_passwd = ServerAdminPwd
16 years, 10 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd slap.h, 1.21, 1.22 proto-slap.h, 1.26, 1.27 libglobs.c, 1.16, 1.17
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16227
Modified Files:
slap.h proto-slap.h libglobs.c
Log Message:
Resolves: #245407
Summary: Add config attributes to cn=config to support Console (comment #1)
Description: Console needs to know the default paths for ldif_dir and bak_dir.
Adding the paths to cn=config.
Index: slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- slap.h 27 Feb 2007 02:57:30 -0000 1.21
+++ slap.h 22 Jun 2007 21:54:58 -0000 1.22
@@ -1728,6 +1728,8 @@
#define CONFIG_LOCKDIR_ATTRIBUTE "nsslapd-lockdir"
#define CONFIG_TMPDIR_ATTRIBUTE "nsslapd-tmpdir"
#define CONFIG_CERTDIR_ATTRIBUTE "nsslapd-certdir"
+#define CONFIG_LDIFDIR_ATTRIBUTE "nsslapd-ldifdir"
+#define CONFIG_BAKDIR_ATTRIBUTE "nsslapd-bakdir"
#define CONFIG_SASLPATH_ATTRIBUTE "nsslapd-saslpath"
#define CONFIG_SSLCLIENTAUTH_ATTRIBUTE "nsslapd-SSLclientAuth"
#define CONFIG_SSL_CHECK_HOSTNAME_ATTRIBUTE "nsslapd-ssl-check-hostname"
@@ -1906,6 +1908,8 @@
char *lockdir; /* full path name of directory containing lock files */
char *tmpdir; /* full path name of directory containing tmp files */
char *certdir; /* full path name of directory containing cert files */
+ char *ldifdir; /* full path name of directory containing ldif files */
+ char *bakdir; /* full path name of directory containing bakup files */
char *saslpath; /* full path name of directory containing sasl plugins */
int attrname_exceptions; /* if true, allow questionable attribute names */
int rewrite_rfc1274; /* return attrs for both v2 and v3 names */
Index: proto-slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- proto-slap.h 27 Feb 2007 02:57:30 -0000 1.26
+++ proto-slap.h 22 Jun 2007 21:54:58 -0000 1.27
@@ -320,6 +320,8 @@
int config_set_lockdir( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_tmpdir( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_certdir( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_ldifdir( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_bakdir( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_saslpath( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_attrname_exceptions( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_hash_filters( const char *attrname, char *value, char *errorbuf, int apply );
@@ -430,6 +432,8 @@
char *config_get_lockdir();
char *config_get_tmpdir();
char *config_get_certdir();
+char *config_get_ldifdir();
+char *config_get_bakdir();
char *config_get_saslpath();
char **config_get_errorlog_list();
char **config_get_accesslog_list();
Index: libglobs.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libglobs.c 2 Mar 2007 22:38:07 -0000 1.16
+++ libglobs.c 22 Jun 2007 21:54:58 -0000 1.17
@@ -558,6 +558,14 @@
{CONFIG_CERTDIR_ATTRIBUTE, config_set_certdir,
NULL, 0,
(void**)&global_slapdFrontendConfig.certdir, CONFIG_STRING, config_get_certdir},
+ /* parameterizing ldif dir */
+ {CONFIG_LDIFDIR_ATTRIBUTE, config_set_ldifdir,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.ldifdir, CONFIG_STRING, config_get_ldifdir},
+ /* parameterizing bak dir */
+ {CONFIG_BAKDIR_ATTRIBUTE, config_set_bakdir,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.bakdir, CONFIG_STRING, config_get_bakdir},
/* parameterizing sasl plugin path */
{CONFIG_SASLPATH_ATTRIBUTE, config_set_saslpath,
NULL, 0,
@@ -4599,6 +4607,77 @@
}
char *
+config_get_ldifdir()
+{
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+ char *retVal;
+
+ CFG_LOCK_READ(slapdFrontendConfig);
+ retVal = config_copy_strval(slapdFrontendConfig->ldifdir);
+ CFG_UNLOCK_READ(slapdFrontendConfig);
+
+ return retVal;
+}
+
+int
+config_set_ldifdir(const char *attrname, char *value, char *errorbuf, int apply)
+{
+ int retVal = LDAP_SUCCESS;
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+ if ( config_value_is_null( attrname, value, errorbuf, 0 )) {
+ return LDAP_OPERATIONS_ERROR;
+ }
+
+ if (!apply) {
+ return retVal;
+ }
+
+ CFG_LOCK_WRITE(slapdFrontendConfig);
+ slapi_ch_free((void **)&slapdFrontendConfig->ldifdir);
+
+ slapdFrontendConfig->ldifdir = slapi_ch_strdup(value);
+
+ CFG_UNLOCK_WRITE(slapdFrontendConfig);
+ return retVal;
+}
+
+char *
+config_get_bakdir()
+{
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+ char *retVal;
+
+ CFG_LOCK_READ(slapdFrontendConfig);
+ retVal = config_copy_strval(slapdFrontendConfig->bakdir);
+ CFG_UNLOCK_READ(slapdFrontendConfig);
+
+ return retVal;
+}
+
+int
+config_set_bakdir(const char *attrname, char *value, char *errorbuf, int apply)
+{
+ int retVal = LDAP_SUCCESS;
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+ if ( config_value_is_null( attrname, value, errorbuf, 0 )) {
+ return LDAP_OPERATIONS_ERROR;
+ }
+
+ if (!apply) {
+ return retVal;
+ }
+
+ CFG_LOCK_WRITE(slapdFrontendConfig);
+ slapi_ch_free((void **)&slapdFrontendConfig->bakdir);
+
+ slapdFrontendConfig->bakdir = slapi_ch_strdup(value);
+
+ CFG_UNLOCK_WRITE(slapdFrontendConfig);
+ return retVal;
+}
+char *
config_get_saslpath()
{
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
16 years, 10 months
[Fedora-directory-commits] adminutil/tests retrieveSIEssl.c, 1.2, 1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil/tests
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11511/adminutil/tests
Modified Files:
retrieveSIEssl.c
Log Message:
Resolves: bug 245396
Bug Description: adminutil: retrieveISIEs returns bogus data
Reviewed by: nkinder (Thanks!)
Fix Description: retrieveISIEs creates a list of id + DN pairs using
the ListNodePtr interface. Each node has a name (the id) and a value
(a char ** with the DN as the first char *) and forms a linked list of
all of the values. It then flattens the list into an array of name/value
pairs for returning. However, instead of passing val[0] to the
addSingleValueAttribute() function for the value, it was passing val cast
to a (char *), which is entirely bogus.
The fix is to pass in ((char**)node->val)[0] which is a char * value. Yet
another lesson in why void * is bad, and why you should not defeat the
compiler's type checker . . .
I also fixed another minor mem leak, and added @nss_inc@ to the list of include directories - I guess it works because pkg-config mozldap[6] always returns the
nss include directory in its output . . .
Platforms tested: RHEL4
Flag day: Yes - autotool file changes
Index: retrieveSIEssl.c
===================================================================
RCS file: /cvs/dirsec/adminutil/tests/retrieveSIEssl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- retrieveSIEssl.c 8 May 2007 19:13:26 -0000 1.2
+++ retrieveSIEssl.c 22 Jun 2007 21:06:45 -0000 1.3
@@ -48,6 +48,8 @@
char *siedn = NULL;
char *siepwd = NULL;
char buf[BUFSIZ];
+ char *userdn;
+ char *passwd;
if (ac > 1) {
configdir = strdup(*(av+1));
@@ -87,6 +89,12 @@
goto done;
}
+ siedn = admldapGetSIEDN(ldapInfo);
+ ADM_GetUserDNString(&rval, &userdn);
+ ADM_GetCurrentPassword(&rval, &passwd);
+
+ admldapSetSIEDN(ldapInfo, userdn);
+ admSetCachedSIEPWD(passwd);
/*
* get servers' DNs belonging to the Admin Server
*/
@@ -97,9 +105,9 @@
goto done;
}
+ admldapSetSIEDN(ldapInfo, siedn);
+
host = admldapGetHost(ldapInfo);
- siedn = admldapGetSIEDN(ldapInfo);
- siepwd = admldapGetSIEPWD(ldapInfo);
for (p = nameList; p && *p; p++) {
PsetHndl pset = NULL;
fprintf(stdout, "%s\n", *p);
@@ -112,8 +120,8 @@
admldapGetPort(ldapInfo),
admldapGetSecurity(ldapInfo),
*p,
- siedn,
- siepwd,
+ userdn,
+ passwd,
NULL,
&rval);
if (rval && (rval != PSET_LOCAL_OPEN_FAIL)) {
@@ -145,13 +153,13 @@
fprintf(stdout, "FAILURE: SIE is not retrieved\n");
}
PL_strfree(host);
- PL_strfree(siedn);
- PL_strfree(siepwd);
/*
* get servers' DNs belonging to the Admin Server
*/
+ admldapSetSIEDN(ldapInfo, userdn);
isieList = getInstalledServerDNListSSL(ldapInfo);
+ admldapSetSIEDN(ldapInfo, siedn);
if (NULL == isieList) {
fprintf(stderr, "ERROR: empty isieList\n");
rval = 1;
@@ -159,7 +167,8 @@
}
for (siecnt = 0; isieList[siecnt]; siecnt++) {
- fprintf(stdout, "%s\n", isieList[siecnt]->attrName);
+ fprintf(stdout, "productID = %s\n", isieList[siecnt]->attrName);
+ fprintf(stdout, "productDN = %s\n", isieList[siecnt]->attrVal[0]);
}
deleteAttributeList(isieList);
if (siecnt > 0) {
16 years, 10 months
[Fedora-directory-commits] adminutil/lib/libadmsslutil admsslutil.c, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil/lib/libadmsslutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11511/adminutil/lib/libadmsslutil
Modified Files:
admsslutil.c
Log Message:
Resolves: bug 245396
Bug Description: adminutil: retrieveISIEs returns bogus data
Reviewed by: nkinder (Thanks!)
Fix Description: retrieveISIEs creates a list of id + DN pairs using
the ListNodePtr interface. Each node has a name (the id) and a value
(a char ** with the DN as the first char *) and forms a linked list of
all of the values. It then flattens the list into an array of name/value
pairs for returning. However, instead of passing val[0] to the
addSingleValueAttribute() function for the value, it was passing val cast
to a (char *), which is entirely bogus.
The fix is to pass in ((char**)node->val)[0] which is a char * value. Yet
another lesson in why void * is bad, and why you should not defeat the
compiler's type checker . . .
I also fixed another minor mem leak, and added @nss_inc@ to the list of include directories - I guess it works because pkg-config mozldap[6] always returns the
nss include directory in its output . . .
Platforms tested: RHEL4
Flag day: Yes - autotool file changes
Index: admsslutil.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/admsslutil.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- admsslutil.c 8 May 2007 19:13:26 -0000 1.8
+++ admsslutil.c 22 Jun 2007 21:06:45 -0000 1.9
@@ -166,6 +166,8 @@
PK11_ConfigurePKCS11(NULL,NULL,NULL,db_name,NULL, NULL,NULL,NULL,
/*minPwdLen=*/8, /*pwdRequired=*/1);
+ PL_strfree(db_name);
+ db_name = NULL;
/* init NSS */
if (NSS_Initialize(securitydir, NULL, NULL, SECMOD_DB, flags)) {
16 years, 10 months
[Fedora-directory-commits] adminutil/lib/libadminutil srvutil.c, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil/lib/libadminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11511/adminutil/lib/libadminutil
Modified Files:
srvutil.c
Log Message:
Resolves: bug 245396
Bug Description: adminutil: retrieveISIEs returns bogus data
Reviewed by: nkinder (Thanks!)
Fix Description: retrieveISIEs creates a list of id + DN pairs using
the ListNodePtr interface. Each node has a name (the id) and a value
(a char ** with the DN as the first char *) and forms a linked list of
all of the values. It then flattens the list into an array of name/value
pairs for returning. However, instead of passing val[0] to the
addSingleValueAttribute() function for the value, it was passing val cast
to a (char *), which is entirely bogus.
The fix is to pass in ((char**)node->val)[0] which is a char * value. Yet
another lesson in why void * is bad, and why you should not defeat the
compiler's type checker . . .
I also fixed another minor mem leak, and added @nss_inc@ to the list of include directories - I guess it works because pkg-config mozldap[6] always returns the
nss include directory in its output . . .
Platforms tested: RHEL4
Flag day: Yes - autotool file changes
Index: srvutil.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadminutil/srvutil.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- srvutil.c 8 May 2007 19:13:25 -0000 1.4
+++ srvutil.c 22 Jun 2007 21:06:44 -0000 1.5
@@ -228,7 +228,7 @@
addSingleValueAttribute(resultList,
i++,
node->name,
- (char*)(node->val));
+ ((char**)node->val)[0]);
node = node->next;
}
}
16 years, 10 months
[Fedora-directory-commits] adminutil Makefile.am, 1.6, 1.7 aclocal.m4, 1.7, 1.8 configure, 1.7, 1.8 missing, 1.6, 1.7 install-sh, 1.6, 1.7 compile, 1.6, 1.7 Makefile.in, 1.7, 1.8 depcomp, 1.6, 1.7 config.sub, 1.6, 1.7 config.guess, 1.6, 1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11511/adminutil
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh compile
Makefile.in depcomp config.sub config.guess
Log Message:
Resolves: bug 245396
Bug Description: adminutil: retrieveISIEs returns bogus data
Reviewed by: nkinder (Thanks!)
Fix Description: retrieveISIEs creates a list of id + DN pairs using
the ListNodePtr interface. Each node has a name (the id) and a value
(a char ** with the DN as the first char *) and forms a linked list of
all of the values. It then flattens the list into an array of name/value
pairs for returning. However, instead of passing val[0] to the
addSingleValueAttribute() function for the value, it was passing val cast
to a (char *), which is entirely bogus.
The fix is to pass in ((char**)node->val)[0] which is a char * value. Yet
another lesson in why void * is bad, and why you should not defeat the
compiler's type checker . . .
I also fixed another minor mem leak, and added @nss_inc@ to the list of include directories - I guess it works because pkg-config mozldap[6] always returns the
nss include directory in its output . . .
Platforms tested: RHEL4
Flag day: Yes - autotool file changes
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am 21 Jun 2007 23:05:05 -0000 1.6
+++ Makefile.am 22 Jun 2007 21:06:44 -0000 1.7
@@ -43,7 +43,7 @@
check_PROGRAMS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
TESTS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
-TEST_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include @nspr_inc@ @ldapsdk_inc@ @icu_inc@
+TEST_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include @nss_inc@ @nspr_inc@ @ldapsdk_inc@ @icu_inc@
TEST_LDADD = libadmsslutil.la libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
retrieveSIE_SOURCES = tests/retrieveSIE.c
@@ -142,7 +142,7 @@
lib/libadmsslutil/sslerror.c \
lib/libadmsslutil/uginfossl.c
-libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@
+libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nss_inc@ @nspr_inc@ @ldapsdk_inc@ @icu_inc@
libadmsslutil_la_LIBADD = libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
if CXXLINK_REQUIRED
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 21 Jun 2007 23:05:05 -0000 1.7
+++ Makefile.in 22 Jun 2007 21:06:44 -0000 1.8
@@ -339,7 +339,7 @@
@CXXLINK_REQUIRED_TRUE@dummy_SOURCES = lib/dummy.cpp
@CXXLINK_REQUIRED_TRUE@dummy_LINK = $(CXXLINK)
@enable_tests_TRUE@TESTS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
-@enable_tests_TRUE@TEST_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include @nspr_inc@ @ldapsdk_inc@ @icu_inc@
+@enable_tests_TRUE@TEST_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include @nss_inc@ @nspr_inc@ @ldapsdk_inc@ @icu_inc@
@enable_tests_TRUE@TEST_LDADD = libadmsslutil.la libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
@enable_tests_TRUE@retrieveSIE_SOURCES = tests/retrieveSIE.c
@enable_tests_TRUE@retrieveSIE_CPPFLAGS = $(TEST_CPPFLAGS)
@@ -416,7 +416,7 @@
lib/libadmsslutil/sslerror.c \
lib/libadmsslutil/uginfossl.c
-libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@
+libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nss_inc@ @nspr_inc@ @ldapsdk_inc@ @icu_inc@
libadmsslutil_la_LIBADD = libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
@CXXLINK_REQUIRED_FALSE@libadmsslutil_la_LINK = $(LINK)
16 years, 10 months
[Fedora-directory-commits] adminserver Makefile.am, 1.15, 1.16 Makefile.in, 1.15, 1.16 aclocal.m4, 1.12, 1.13 configure, 1.14, 1.15 config.h.in, 1.3, 1.4 missing, 1.7, 1.8 install-sh, 1.7, 1.8 compile, 1.7, 1.8 depcomp, 1.7, 1.8 config.sub, 1.7, 1.8 config.guess, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17751/adminserver
Modified Files:
Makefile.am Makefile.in aclocal.m4 configure config.h.in
missing install-sh compile depcomp config.sub config.guess
Log Message:
Resolves: bug 245214
Bug Description: adminserver: Solaris port for 1.1
Reviewed by: nhosoi (Thanks!)
Fix Description: Fix build breakage involving CXXLINK and LINK
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.am 22 Jun 2007 01:34:18 -0000 1.15
+++ Makefile.am 22 Jun 2007 02:31:59 -0000 1.16
@@ -123,11 +123,10 @@
@nss_lib@ -lsmime3 -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 $(LIBNSL) $(LIBSOCKET) $(LIBCSTD) $(LIBCRUN)
if CXXLINK_REQUIRED
-REALLINK = $(CXXLINK)
+MYLINK = $(CXXLINK)
else
-REALLINK = $(LINK)
+MYLINK = $(LINK)
endif
-LINK = $(REALLINK)
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
@@ -167,6 +166,7 @@
admserv/newinst/src/ConfigDSDialogs.pm
libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES)
+libds_admin_serv_la_LINK = $(MYLINK)
libdsa_a_SOURCES = lib/libdsa/dsalib_conf.c \
lib/libdsa/dsalib_debug.c \
@@ -223,58 +223,88 @@
sec_activate_LDADD = $(DEFAULT_LIBS)
stopsrv_LDADD = $(DEFAULT_LIBS)
+admpw_LINK = $(MYLINK)
+start_config_ds_LINK = $(MYLINK)
+security_LINK = $(MYLINK)
+ugdsconfig_LINK = $(MYLINK)
+ReadLog_LINK = $(MYLINK)
+config_LINK = $(MYLINK)
+statpingserv_LINK = $(MYLINK)
+viewdata_LINK = $(MYLINK)
+dsconfig_LINK = $(MYLINK)
+monreplication_LINK = $(MYLINK)
+restartsrv_LINK = $(MYLINK)
+statusping_LINK = $(MYLINK)
+viewlog_LINK = $(MYLINK)
+htmladmin_LINK = $(MYLINK)
+sec_activate_LINK = $(MYLINK)
+stopsrv_LINK = $(MYLINK)
+
# ds admin interfaces
ds_start_SOURCES = admserv/cgi-ds/start.c admserv/cgi-ds/init_ds_env.c
ds_start_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_start_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_start_LINK = $(MYLINK)
ds_restart_SOURCES = admserv/cgi-ds/restart.c admserv/cgi-ds/init_ds_env.c
ds_restart_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_restart_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_restart_LINK = $(MYLINK)
ds_shutdown_SOURCES = admserv/cgi-ds/shutdown.c admserv/cgi-ds/init_ds_env.c
ds_shutdown_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_shutdown_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_shutdown_LINK = $(MYLINK)
ds_ldif2db_SOURCES = admserv/cgi-ds/ds_ldif2db.c admserv/cgi-ds/init_ds_env.c
ds_ldif2db_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_ldif2db_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_ldif2db_LINK = $(MYLINK)
ds_db2ldif_SOURCES = admserv/cgi-ds/ds_db2ldif.c admserv/cgi-ds/init_ds_env.c
ds_db2ldif_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_db2ldif_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_db2ldif_LINK = $(MYLINK)
ds_bak2db_SOURCES = admserv/cgi-ds/ds_bak2db.c admserv/cgi-ds/init_ds_env.c
ds_bak2db_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_bak2db_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_bak2db_LINK = $(MYLINK)
ds_db2bak_SOURCES = admserv/cgi-ds/ds_db2bak.c admserv/cgi-ds/init_ds_env.c
ds_db2bak_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_db2bak_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_db2bak_LINK = $(MYLINK)
ds_listdb_SOURCES = admserv/cgi-ds/ds_listdb.c admserv/cgi-ds/init_ds_env.c
ds_listdb_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_listdb_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_listdb_LINK = $(MYLINK)
ds_rmdb_SOURCES = admserv/cgi-ds/ds_rmdb.c admserv/cgi-ds/init_ds_env.c
ds_rmdb_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_rmdb_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_rmdb_LINK = $(MYLINK)
ds_remove_SOURCES = admserv/cgi-ds/ds_remove.c admserv/cgi-ds/init_ds_env.c
ds_remove_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_remove_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_remove_LINK = $(MYLINK)
ds_snmpctrl_SOURCES = admserv/cgi-ds/ds_snmpctrl.c admserv/cgi-ds/init_ds_env.c
ds_snmpctrl_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_snmpctrl_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_snmpctrl_LINK = $(MYLINK)
ds_vlvindex_SOURCES = admserv/cgi-ds/vlvindex.c admserv/cgi-ds/init_ds_env.c
ds_vlvindex_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_vlvindex_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_vlvindex_LINK = $(MYLINK)
ds_addindex_SOURCES = admserv/cgi-ds/addindex.c admserv/cgi-ds/init_ds_env.c
ds_addindex_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_addindex_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_addindex_LINK = $(MYLINK)
############## Data Files ################
HTMLDIR = admserv/html
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 22 Jun 2007 01:34:18 -0000 1.15
+++ Makefile.in 22 Jun 2007 02:31:59 -0000 1.16
@@ -255,6 +255,9 @@
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -559,9 +562,8 @@
@icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 \
@nss_lib@ -lsmime3 -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 $(LIBNSL) $(LIBSOCKET) $(LIBCSTD) $(LIBCRUN)
-@CXXLINK_REQUIRED_FALSE@REALLINK = $(LINK)
-@CXXLINK_REQUIRED_TRUE@REALLINK = $(CXXLINK)
-LINK = $(REALLINK)
+@CXXLINK_REQUIRED_FALSE@MYLINK = $(LINK)
+@CXXLINK_REQUIRED_TRUE@MYLINK = $(CXXLINK)
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \
admserv/schema/ldif/01nsroot.ldif.tmpl \
@@ -591,6 +593,7 @@
admserv/newinst/src/ConfigDSDialogs.pm
libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES)
+libds_admin_serv_la_LINK = $(MYLINK)
libdsa_a_SOURCES = lib/libdsa/dsalib_conf.c \
lib/libdsa/dsalib_debug.c \
lib/libdsa/dsalib_ldif.c \
@@ -644,47 +647,76 @@
htmladmin_LDADD = $(DEFAULT_LIBS)
sec_activate_LDADD = $(DEFAULT_LIBS)
stopsrv_LDADD = $(DEFAULT_LIBS)
+admpw_LINK = $(MYLINK)
+start_config_ds_LINK = $(MYLINK)
+security_LINK = $(MYLINK)
+ugdsconfig_LINK = $(MYLINK)
+ReadLog_LINK = $(MYLINK)
+config_LINK = $(MYLINK)
+statpingserv_LINK = $(MYLINK)
+viewdata_LINK = $(MYLINK)
+dsconfig_LINK = $(MYLINK)
+monreplication_LINK = $(MYLINK)
+restartsrv_LINK = $(MYLINK)
+statusping_LINK = $(MYLINK)
+viewlog_LINK = $(MYLINK)
+htmladmin_LINK = $(MYLINK)
+sec_activate_LINK = $(MYLINK)
+stopsrv_LINK = $(MYLINK)
# ds admin interfaces
ds_start_SOURCES = admserv/cgi-ds/start.c admserv/cgi-ds/init_ds_env.c
ds_start_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_start_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_start_LINK = $(MYLINK)
ds_restart_SOURCES = admserv/cgi-ds/restart.c admserv/cgi-ds/init_ds_env.c
ds_restart_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_restart_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_restart_LINK = $(MYLINK)
ds_shutdown_SOURCES = admserv/cgi-ds/shutdown.c admserv/cgi-ds/init_ds_env.c
ds_shutdown_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_shutdown_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_shutdown_LINK = $(MYLINK)
ds_ldif2db_SOURCES = admserv/cgi-ds/ds_ldif2db.c admserv/cgi-ds/init_ds_env.c
ds_ldif2db_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_ldif2db_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_ldif2db_LINK = $(MYLINK)
ds_db2ldif_SOURCES = admserv/cgi-ds/ds_db2ldif.c admserv/cgi-ds/init_ds_env.c
ds_db2ldif_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_db2ldif_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_db2ldif_LINK = $(MYLINK)
ds_bak2db_SOURCES = admserv/cgi-ds/ds_bak2db.c admserv/cgi-ds/init_ds_env.c
ds_bak2db_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_bak2db_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_bak2db_LINK = $(MYLINK)
ds_db2bak_SOURCES = admserv/cgi-ds/ds_db2bak.c admserv/cgi-ds/init_ds_env.c
ds_db2bak_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_db2bak_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_db2bak_LINK = $(MYLINK)
ds_listdb_SOURCES = admserv/cgi-ds/ds_listdb.c admserv/cgi-ds/init_ds_env.c
ds_listdb_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_listdb_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_listdb_LINK = $(MYLINK)
ds_rmdb_SOURCES = admserv/cgi-ds/ds_rmdb.c admserv/cgi-ds/init_ds_env.c
ds_rmdb_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_rmdb_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_rmdb_LINK = $(MYLINK)
ds_remove_SOURCES = admserv/cgi-ds/ds_remove.c admserv/cgi-ds/init_ds_env.c
ds_remove_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_remove_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_remove_LINK = $(MYLINK)
ds_snmpctrl_SOURCES = admserv/cgi-ds/ds_snmpctrl.c admserv/cgi-ds/init_ds_env.c
ds_snmpctrl_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_snmpctrl_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_snmpctrl_LINK = $(MYLINK)
ds_vlvindex_SOURCES = admserv/cgi-ds/vlvindex.c admserv/cgi-ds/init_ds_env.c
ds_vlvindex_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_vlvindex_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_vlvindex_LINK = $(MYLINK)
ds_addindex_SOURCES = admserv/cgi-ds/addindex.c admserv/cgi-ds/init_ds_env.c
ds_addindex_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_addindex_LDADD = libdsa.a $(DEFAULT_LIBS)
+ds_addindex_LINK = $(MYLINK)
############## Data Files ################
HTMLDIR = admserv/html
@@ -977,7 +1009,7 @@
lib/libadmin/util.lo: lib/libadmin/$(am__dirstamp) \
lib/libadmin/$(DEPDIR)/$(am__dirstamp)
libds-admin-serv.la: $(libds_admin_serv_la_OBJECTS) $(libds_admin_serv_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(libds_admin_serv_la_OBJECTS) $(libds_admin_serv_la_LIBADD) $(LIBS)
+ $(libds_admin_serv_la_LINK) -rpath $(libdir) $(libds_admin_serv_la_OBJECTS) $(libds_admin_serv_la_LIBADD) $(LIBS)
install-cgibinPROGRAMS: $(cgibin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(cgibindir)" || $(MKDIR_P) "$(DESTDIR)$(cgibindir)"
@@ -1017,17 +1049,17 @@
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
ReadLog$(EXEEXT): $(ReadLog_OBJECTS) $(ReadLog_DEPENDENCIES)
@rm -f ReadLog$(EXEEXT)
- $(LINK) $(ReadLog_OBJECTS) $(ReadLog_LDADD) $(LIBS)
+ $(ReadLog_LINK) $(ReadLog_OBJECTS) $(ReadLog_LDADD) $(LIBS)
admserv/cgi-src40/admpw.$(OBJEXT): admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
admpw$(EXEEXT): $(admpw_OBJECTS) $(admpw_DEPENDENCIES)
@rm -f admpw$(EXEEXT)
- $(LINK) $(admpw_OBJECTS) $(admpw_LDADD) $(LIBS)
+ $(admpw_LINK) $(admpw_OBJECTS) $(admpw_LDADD) $(LIBS)
admserv/cgi-src40/config.$(OBJEXT): admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
config$(EXEEXT): $(config_OBJECTS) $(config_DEPENDENCIES)
@rm -f config$(EXEEXT)
- $(LINK) $(config_OBJECTS) $(config_LDADD) $(LIBS)
+ $(config_LINK) $(config_OBJECTS) $(config_LDADD) $(LIBS)
admserv/cgi-src40/download.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
@@ -1048,7 +1080,7 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
ds_addindex$(EXEEXT): $(ds_addindex_OBJECTS) $(ds_addindex_DEPENDENCIES)
@rm -f ds_addindex$(EXEEXT)
- $(LINK) $(ds_addindex_OBJECTS) $(ds_addindex_LDADD) $(LIBS)
+ $(ds_addindex_LINK) $(ds_addindex_OBJECTS) $(ds_addindex_LDADD) $(LIBS)
admserv/cgi-ds/ds_bak2db-ds_bak2db.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1057,7 +1089,7 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
ds_bak2db$(EXEEXT): $(ds_bak2db_OBJECTS) $(ds_bak2db_DEPENDENCIES)
@rm -f ds_bak2db$(EXEEXT)
- $(LINK) $(ds_bak2db_OBJECTS) $(ds_bak2db_LDADD) $(LIBS)
+ $(ds_bak2db_LINK) $(ds_bak2db_OBJECTS) $(ds_bak2db_LDADD) $(LIBS)
admserv/cgi-ds/ds_db2bak-ds_db2bak.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1066,7 +1098,7 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
ds_db2bak$(EXEEXT): $(ds_db2bak_OBJECTS) $(ds_db2bak_DEPENDENCIES)
@rm -f ds_db2bak$(EXEEXT)
- $(LINK) $(ds_db2bak_OBJECTS) $(ds_db2bak_LDADD) $(LIBS)
+ $(ds_db2bak_LINK) $(ds_db2bak_OBJECTS) $(ds_db2bak_LDADD) $(LIBS)
admserv/cgi-ds/ds_db2ldif-ds_db2ldif.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1075,7 +1107,7 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
ds_db2ldif$(EXEEXT): $(ds_db2ldif_OBJECTS) $(ds_db2ldif_DEPENDENCIES)
@rm -f ds_db2ldif$(EXEEXT)
- $(LINK) $(ds_db2ldif_OBJECTS) $(ds_db2ldif_LDADD) $(LIBS)
+ $(ds_db2ldif_LINK) $(ds_db2ldif_OBJECTS) $(ds_db2ldif_LDADD) $(LIBS)
admserv/cgi-ds/ds_ldif2db-ds_ldif2db.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1084,7 +1116,7 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
ds_ldif2db$(EXEEXT): $(ds_ldif2db_OBJECTS) $(ds_ldif2db_DEPENDENCIES)
@rm -f ds_ldif2db$(EXEEXT)
- $(LINK) $(ds_ldif2db_OBJECTS) $(ds_ldif2db_LDADD) $(LIBS)
+ $(ds_ldif2db_LINK) $(ds_ldif2db_OBJECTS) $(ds_ldif2db_LDADD) $(LIBS)
admserv/cgi-ds/ds_listdb-ds_listdb.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1093,7 +1125,7 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
ds_listdb$(EXEEXT): $(ds_listdb_OBJECTS) $(ds_listdb_DEPENDENCIES)
@rm -f ds_listdb$(EXEEXT)
- $(LINK) $(ds_listdb_OBJECTS) $(ds_listdb_LDADD) $(LIBS)
+ $(ds_listdb_LINK) $(ds_listdb_OBJECTS) $(ds_listdb_LDADD) $(LIBS)
admserv/cgi-ds/ds_remove-ds_remove.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1102,7 +1134,7 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
ds_remove$(EXEEXT): $(ds_remove_OBJECTS) $(ds_remove_DEPENDENCIES)
@rm -f ds_remove$(EXEEXT)
- $(LINK) $(ds_remove_OBJECTS) $(ds_remove_LDADD) $(LIBS)
+ $(ds_remove_LINK) $(ds_remove_OBJECTS) $(ds_remove_LDADD) $(LIBS)
admserv/cgi-ds/ds_restart-restart.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1111,7 +1143,7 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
ds_restart$(EXEEXT): $(ds_restart_OBJECTS) $(ds_restart_DEPENDENCIES)
@rm -f ds_restart$(EXEEXT)
- $(LINK) $(ds_restart_OBJECTS) $(ds_restart_LDADD) $(LIBS)
+ $(ds_restart_LINK) $(ds_restart_OBJECTS) $(ds_restart_LDADD) $(LIBS)
admserv/cgi-ds/ds_rmdb-ds_rmdb.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1120,7 +1152,7 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
ds_rmdb$(EXEEXT): $(ds_rmdb_OBJECTS) $(ds_rmdb_DEPENDENCIES)
@rm -f ds_rmdb$(EXEEXT)
- $(LINK) $(ds_rmdb_OBJECTS) $(ds_rmdb_LDADD) $(LIBS)
+ $(ds_rmdb_LINK) $(ds_rmdb_OBJECTS) $(ds_rmdb_LDADD) $(LIBS)
admserv/cgi-ds/ds_shutdown-shutdown.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1129,7 +1161,7 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
ds_shutdown$(EXEEXT): $(ds_shutdown_OBJECTS) $(ds_shutdown_DEPENDENCIES)
@rm -f ds_shutdown$(EXEEXT)
- $(LINK) $(ds_shutdown_OBJECTS) $(ds_shutdown_LDADD) $(LIBS)
+ $(ds_shutdown_LINK) $(ds_shutdown_OBJECTS) $(ds_shutdown_LDADD) $(LIBS)
admserv/cgi-ds/ds_snmpctrl-ds_snmpctrl.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1138,7 +1170,7 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
ds_snmpctrl$(EXEEXT): $(ds_snmpctrl_OBJECTS) $(ds_snmpctrl_DEPENDENCIES)
@rm -f ds_snmpctrl$(EXEEXT)
- $(LINK) $(ds_snmpctrl_OBJECTS) $(ds_snmpctrl_LDADD) $(LIBS)
+ $(ds_snmpctrl_LINK) $(ds_snmpctrl_OBJECTS) $(ds_snmpctrl_LDADD) $(LIBS)
admserv/cgi-ds/ds_start-start.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1147,7 +1179,7 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
ds_start$(EXEEXT): $(ds_start_OBJECTS) $(ds_start_DEPENDENCIES)
@rm -f ds_start$(EXEEXT)
- $(LINK) $(ds_start_OBJECTS) $(ds_start_LDADD) $(LIBS)
+ $(ds_start_LINK) $(ds_start_OBJECTS) $(ds_start_LDADD) $(LIBS)
admserv/cgi-ds/ds_vlvindex-vlvindex.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1156,13 +1188,13 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
ds_vlvindex$(EXEEXT): $(ds_vlvindex_OBJECTS) $(ds_vlvindex_DEPENDENCIES)
@rm -f ds_vlvindex$(EXEEXT)
- $(LINK) $(ds_vlvindex_OBJECTS) $(ds_vlvindex_LDADD) $(LIBS)
+ $(ds_vlvindex_LINK) $(ds_vlvindex_OBJECTS) $(ds_vlvindex_LDADD) $(LIBS)
admserv/cgi-src40/dsconfig.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
dsconfig$(EXEEXT): $(dsconfig_OBJECTS) $(dsconfig_DEPENDENCIES)
@rm -f dsconfig$(EXEEXT)
- $(LINK) $(dsconfig_OBJECTS) $(dsconfig_LDADD) $(LIBS)
+ $(dsconfig_LINK) $(dsconfig_OBJECTS) $(dsconfig_LDADD) $(LIBS)
admserv/cgi-src40/help.$(OBJEXT): admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
help$(EXEEXT): $(help_OBJECTS) $(help_DEPENDENCIES)
@@ -1173,73 +1205,73 @@
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
htmladmin$(EXEEXT): $(htmladmin_OBJECTS) $(htmladmin_DEPENDENCIES)
@rm -f htmladmin$(EXEEXT)
- $(LINK) $(htmladmin_OBJECTS) $(htmladmin_LDADD) $(LIBS)
+ $(htmladmin_LINK) $(htmladmin_OBJECTS) $(htmladmin_LDADD) $(LIBS)
admserv/cgi-src40/monreplication.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
monreplication$(EXEEXT): $(monreplication_OBJECTS) $(monreplication_DEPENDENCIES)
@rm -f monreplication$(EXEEXT)
- $(LINK) $(monreplication_OBJECTS) $(monreplication_LDADD) $(LIBS)
+ $(monreplication_LINK) $(monreplication_OBJECTS) $(monreplication_LDADD) $(LIBS)
admserv/cgi-src40/restartsrv.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
restartsrv$(EXEEXT): $(restartsrv_OBJECTS) $(restartsrv_DEPENDENCIES)
@rm -f restartsrv$(EXEEXT)
- $(LINK) $(restartsrv_OBJECTS) $(restartsrv_LDADD) $(LIBS)
+ $(restartsrv_LINK) $(restartsrv_OBJECTS) $(restartsrv_LDADD) $(LIBS)
admserv/cgi-src40/sec-activate.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
sec-activate$(EXEEXT): $(sec_activate_OBJECTS) $(sec_activate_DEPENDENCIES)
@rm -f sec-activate$(EXEEXT)
- $(LINK) $(sec_activate_OBJECTS) $(sec_activate_LDADD) $(LIBS)
+ $(sec_activate_LINK) $(sec_activate_OBJECTS) $(sec_activate_LDADD) $(LIBS)
admserv/cgi-src40/security.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
security$(EXEEXT): $(security_OBJECTS) $(security_DEPENDENCIES)
@rm -f security$(EXEEXT)
- $(LINK) $(security_OBJECTS) $(security_LDADD) $(LIBS)
+ $(security_LINK) $(security_OBJECTS) $(security_LDADD) $(LIBS)
admserv/cgi-src40/start_config_ds.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
start_config_ds$(EXEEXT): $(start_config_ds_OBJECTS) $(start_config_ds_DEPENDENCIES)
@rm -f start_config_ds$(EXEEXT)
- $(LINK) $(start_config_ds_OBJECTS) $(start_config_ds_LDADD) $(LIBS)
+ $(start_config_ds_LINK) $(start_config_ds_OBJECTS) $(start_config_ds_LDADD) $(LIBS)
admserv/cgi-src40/statpingserv.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
statpingserv$(EXEEXT): $(statpingserv_OBJECTS) $(statpingserv_DEPENDENCIES)
@rm -f statpingserv$(EXEEXT)
- $(LINK) $(statpingserv_OBJECTS) $(statpingserv_LDADD) $(LIBS)
+ $(statpingserv_LINK) $(statpingserv_OBJECTS) $(statpingserv_LDADD) $(LIBS)
admserv/cgi-src40/statusping.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
statusping$(EXEEXT): $(statusping_OBJECTS) $(statusping_DEPENDENCIES)
@rm -f statusping$(EXEEXT)
- $(LINK) $(statusping_OBJECTS) $(statusping_LDADD) $(LIBS)
+ $(statusping_LINK) $(statusping_OBJECTS) $(statusping_LDADD) $(LIBS)
admserv/cgi-src40/stopsrv.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
stopsrv$(EXEEXT): $(stopsrv_OBJECTS) $(stopsrv_DEPENDENCIES)
@rm -f stopsrv$(EXEEXT)
- $(LINK) $(stopsrv_OBJECTS) $(stopsrv_LDADD) $(LIBS)
+ $(stopsrv_LINK) $(stopsrv_OBJECTS) $(stopsrv_LDADD) $(LIBS)
admserv/cgi-src40/ugdsconfig.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
ugdsconfig$(EXEEXT): $(ugdsconfig_OBJECTS) $(ugdsconfig_DEPENDENCIES)
@rm -f ugdsconfig$(EXEEXT)
- $(LINK) $(ugdsconfig_OBJECTS) $(ugdsconfig_LDADD) $(LIBS)
+ $(ugdsconfig_LINK) $(ugdsconfig_OBJECTS) $(ugdsconfig_LDADD) $(LIBS)
admserv/cgi-src40/viewdata.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
viewdata$(EXEEXT): $(viewdata_OBJECTS) $(viewdata_DEPENDENCIES)
@rm -f viewdata$(EXEEXT)
- $(LINK) $(viewdata_OBJECTS) $(viewdata_LDADD) $(LIBS)
+ $(viewdata_LINK) $(viewdata_OBJECTS) $(viewdata_LDADD) $(LIBS)
admserv/cgi-src40/viewlog.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
viewlog$(EXEEXT): $(viewlog_OBJECTS) $(viewlog_DEPENDENCIES)
@rm -f viewlog$(EXEEXT)
- $(LINK) $(viewlog_OBJECTS) $(viewlog_LDADD) $(LIBS)
+ $(viewlog_LINK) $(viewlog_OBJECTS) $(viewlog_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
16 years, 10 months