[Fedora-directory-commits] setuputil components.mk,1.2,1.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14578
Modified Files:
components.mk
Log Message:
[175900] Setup Util build (RPM); comment#9
Preparation for the RPM build.
1) If these environment variables are set, the paths are used instead of the
"local paths" or "internal paths".
2) If the environment variables are set, use shared libraries not the static
libraries. Since the dependency on the LDAP C SDK is guaranteed to be solved
when we use rpm for the installation, we don't need to link the static
libraries (Plus, the static libraries -- libldap50.a, liblber50.a, libldif50.a
are not part of mozldap nor mozldap-devel).
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/components.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- components.mk 23 Feb 2006 22:50:21 -0000 1.2
+++ components.mk 19 Jun 2006 16:53:13 -0000 1.3
@@ -208,15 +208,26 @@
# LDAP SDK
###################################################
-ifdef LDAPSDK_SOURCE_ROOT
- LDAPSDK_LIBPATH = $(LDAPSDK_SOURCE_ROOT)/dist/lib
+ifdef LDAPCSDK_INCLUDE_DIR
+ LDAPSDK_INCDIR = $(LDAPCSDK_INCLUDE_DIR)
+else
+ ifdef LDAPSDK_SOURCE_ROOT
LDAPSDK_INCDIR = $(LDAPSDK_SOURCE_ROOT)/dist/public/ldap
- LDAPSDK_BINPATH = $(LDAPSDK_SOURCE_ROOT)/dist/bin
+ else
+ LDAPSDK_INCDIR = $(LDAP_ROOT)/include
+ endif
+endif
+
+ifdef LDAPCSDK_LIB_DIR
+ LDAPSDK_LIBPATH = $(LDAPCSDK_LIB_DIR)
else
+ ifdef LDAPSDK_SOURCE_ROOT
+ LDAPSDK_LIBPATH = $(LDAPSDK_SOURCE_ROOT)/dist/lib
+ else
LDAPSDK_LIBPATH = $(LDAP_ROOT)/lib
- LDAPSDK_INCDIR = $(LDAP_ROOT)/include
- LDAPSDK_BINPATH = $(LDAP_ROOT)/bin
+ endif
endif
+
LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR)
# package the command line programs
@@ -229,22 +240,24 @@
LDAP_LIBPATH = $(LDAPSDK_LIBPATH)
LDAP_INCLUDE = $(LDAPSDK_INCDIR)
-LDAP_TOOLDIR = $(LDAPSDK_BINPATH)
ifeq ($(ARCH), WINNT)
- LDAP_LIBNAMES = ldapssl32v$(LDAP_SUF) ldap32v$(LDAP_SUF) ldappr32v$(LDAP_SUF)
- LDAPDLL_NAME = $(addprefix ns, $(LDAP_LIBNAMES))
- LDAPOBJNAME = $(addsuffix .lib, $(LDAPDLL_NAME))
+ LDAP_LIBNAMES = ldapssl32v$(LDAP_SUF) ldap32v$(LDAP_SUF) ldappr32v$(LDAP_SUF)
+ LDAPDLL_NAME = $(addprefix ns, $(LDAP_LIBNAMES))
+ LDAPOBJNAME = $(addsuffix .lib, $(LDAPDLL_NAME))
+ LDAPLINK = $(addprefix $(LDAP_LIBPATH)/, $(LDAPOBJNAME))
else
- LDAP_SOLIB_NAMES = ssldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) ldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) prldap$(LDAP_SUF)$(LDAP_DLL_PRESUF)
- LDAP_LIBNAMES = ldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) lber$(LDAP_SUF)$(LDAP_DLL_PRESUF)
- LDAP_SOLIBS = $(addsuffix .$(LDAP_DLL_SUFFIX), $(addprefix lib, $(LDAP_SOLIB_NAMES)))
- LDAPOBJNAME = $(addsuffix .a, $(addprefix lib, $(LDAP_LIBNAMES)))
- LDAPLINK = -L$(LDAP_LIBPATH) $(addprefix -l, $(LDAP_SOLIB_NAMES))
+ LDAP_SOLIB_NAMES = ssldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) ldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) prldap$(LDAP_SUF)$(LDAP_DLL_PRESUF)
+ LDAP_LIBNAMES = ldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) lber$(LDAP_SUF)$(LDAP_DLL_PRESUF)
+ LDAP_SOLIBS = $(addsuffix .$(LDAP_DLL_SUFFIX), $(addprefix lib, $(LDAP_SOLIB_NAMES)))
+ LDAPOBJNAME = $(addsuffix .a, $(addprefix lib, $(LDAP_LIBNAMES)))
+ ifdef LDAPCSDK_LIB_DIR # we are using the system LDAPCSDK.
+ LDAPLINK = -L$(LDAP_LIBPATH) $(addprefix -l, $(LDAP_SOLIB_NAMES))
+ else
+ LDAPLINK = $(addprefix $(LDAP_LIBPATH)/, $(LDAPOBJNAME))
+ endif
endif
-LDAPLINK = $(addprefix $(LDAP_LIBPATH)/, $(LDAPOBJNAME))
-
#################################################################
# Infozip (for Windows Packaging)
#################################################################
17 years, 9 months
[Fedora-directory-commits] adminserver/admserv/console Makefile, 1.6, 1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2103
Modified Files:
Makefile
Log Message:
[195258] Changes for the internal build
package/java directory needs to be created explicitly. It used to be
generated by the adminconsole build, which was moved out from the admin server.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile 23 May 2006 22:13:37 -0000 1.6
+++ Makefile 16 Jun 2006 16:49:54 -0000 1.7
@@ -41,6 +41,9 @@
cd cmdln; $(MAKE) $(MFLAGS)
package:
+ if [ ! -d $(PACKAGEDIR) ] ; then \
+ mkdir -p $(PACKAGEDIR); \
+ fi
cp smartupdate/goto.gif $(PACKAGEDIR)
cp smartupdate/spacer.gif $(PACKAGEDIR)
cp smartupdate/start-console.html $(PACKAGEDIR)
17 years, 9 months
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.47, 1.48
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2073
Modified Files:
pkgadmin.mk
Log Message:
[195258] Changes for the internal build
fixed find syntax.
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- pkgadmin.mk 23 May 2006 22:13:36 -0000 1.47
+++ pkgadmin.mk 16 Jun 2006 16:48:47 -0000 1.48
@@ -272,9 +272,9 @@
cp -p admconfig $(ADMIN_DIR)/bin/admin;
cd $(JAVA_PACKAGE_DIR) ; \
- find *.html *.gif *.jpg | $(CPIO) $(ADMIN_DIR)/java/html
+ find . -name "*.html" -o -name "*.gif" -o -name "*.jpg" | $(CPIO) $(ADMIN_DIR)/java/html
cd $(JAVA_PACKAGE_DIR)/.. ; \
- find *.html | $(CPIO) $(ADMIN_DIR)/java/html/en
+ find . -name "*.html" | $(CPIO) $(ADMIN_DIR)/java/html/en
endif # NOJAVA
cp $(BUILD_ROOT)/lib/ldaputil/certmap.conf $(ADMIN_DIR)/shared/config
17 years, 9 months
[Fedora-directory-commits] adminserver components.mk,1.51,1.52
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20910
Modified Files:
components.mk
Log Message:
[195258] Changes for the internal build:
.picking up the new components (SetupUtil, AdminUtil, mod_admserv,
AdmServConsole) from /s/b/sbsintegration
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- components.mk 15 Jun 2006 01:29:14 -0000 1.51
+++ components.mk 16 Jun 2006 00:04:03 -0000 1.52
@@ -137,7 +137,7 @@
# SETUPUTIL
##############################################################
-SETUPUTIL_RELDATE = 20060405
+SETUPUTIL_RELDATE = 20060615
SETUPUTIL_FILE = setuputil.tar.gz
SETUPUTIL_COMPNAME = setuputil/1.0
@@ -171,7 +171,7 @@
###############################################################
ADMINUTIL_SUF = 10
-ADMINUTIL_RELDATE = 20060511
+ADMINUTIL_RELDATE = 20060615
ADMINUTIL_VERSION = $(ADMINUTIL_RELDATE)
ADMINUTIL_ROOT = $(NSCP_COMPDIR)/adminutil
ADMINUTIL_COMPNAME = adminutil/1.0
@@ -260,7 +260,7 @@
# MOD_ADMSERV
#############################################################
-MOD_ADMSERV_RELDATE = 20060511
+MOD_ADMSERV_RELDATE = 20060615
MOD_ADMSERV_SUF = 1.0
MOD_ADMSERV_VERSION = $(MOD_ADMSERV_RELDATE)
@@ -404,7 +404,7 @@
ADMSERVCONSOLE_SUF = 1.0.2
ADMSERVCONSOLE_GEN_SUF = 1.0
-ADMSERVCONSOLE_RELDATE = 20060523
+ADMSERVCONSOLE_RELDATE = 20060615
ADMSERVCONSOLE_COMP = admservconsole/$(ADMSERVCONSOLE_GEN_SUF)
17 years, 9 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 admpw.c, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29109
Modified Files:
admpw.c
Log Message:
[191832] Admin Server password always remembers initial password on (part 2)
Removed fclose if the preceding fopen failed.
Index: admpw.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/admpw.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- admpw.c 31 Mar 2006 22:58:20 -0000 1.5
+++ admpw.c 15 Jun 2006 17:04:58 -0000 1.6
@@ -215,7 +215,6 @@
static char inbuf[BIG_LINE];
if (f==NULL) {
- fclose(f);
rpt_err(SYSTEM_ERROR, i18nMsg(DBT_OPEN_ADMPW, "Can not open admpw file"), NULL, NULL);
}
if (fgets(inbuf, sizeof(inbuf), f) == NULL) {
@@ -259,7 +258,6 @@
logMsg("newuid=%s, newpw=%s\n", newuid ? newuid:"", newpw ? newpw : "");
if ((f=fopen(filename, "r"))==NULL) {
- fclose(f);
rpt_err(SYSTEM_ERROR, i18nMsg(DBT_OPEN_ADMPW,"Can not open admpw file"), NULL, NULL);
}
if (fgets(inbuf, sizeof(inbuf), f) == NULL) {
@@ -307,7 +305,6 @@
f = fopen(filename, "w");
if (f==NULL) {
- fclose(f);
rpt_err(SYSTEM_ERROR, i18nMsg(DBT_OPEN_ADMPW_WR, "Can not open admpw file for writing"), NULL, NULL);
}
@@ -341,7 +338,6 @@
f = fopen(filename, "r");
if (f==NULL) {
- fclose(f);
rpt_err(SYSTEM_ERROR, i18nMsg(DBT_OPEN_ADMCONF_RD, "Can not open adm.conf for reading"), NULL, NULL);
}
@@ -363,7 +359,6 @@
f = fopen(filename, "w");
if (f==NULL) {
- fclose(f);
rpt_err(SYSTEM_ERROR, i18nMsg(DBT_OPEN_ADMCONF_WR, "Can not open adm.conf for writing"), NULL, NULL);
}
17 years, 9 months
[Fedora-directory-commits] admservconsole/src/com/netscape/management/admserv/panel CGIAccessSetup.java, 1.1.1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29018
Modified Files:
CGIAccessSetup.java
Log Message:
[191832] Admin Server password always remembers initial password on (part 2)
Updated the in-memory admin server password when modifying the password in DS
returns SUCCESS.
Index: CGIAccessSetup.java
===================================================================
RCS file: /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/panel/CGIAccessSetup.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- CGIAccessSetup.java 22 May 2006 18:14:45 -0000 1.1.1.1
+++ CGIAccessSetup.java 15 Jun 2006 17:02:33 -0000 1.2
@@ -78,7 +78,11 @@
throw new RemoteRequestException(e);
}
- task.exec();
+ if (0 == task.exec()) {
+ // Since we've updated the Admin Password,
+ // let's update the one in _consoleInfo.
+ _consoleInfo.setAuthenticationPassword(pwd);
+ }
int status = task.getStatus();
Debug.println(adminURL + " "+status);
17 years, 9 months
[Fedora-directory-commits] mod_admserv mod_admserv.c,1.24,1.25
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26620
Modified Files:
mod_admserv.c
Log Message:
[191832] Admin Server password always remembers initial password on (part 2)
1) task_update_registry_server_bindpw updates the password of "uid=admin,
ou=Administrators, ou=TopologyManagement, o=NetscapeRoot"
2) in change_sie_password
2-1) increased outbuf size to 64 bytes to store the base64 encoded new password
by apr_sha1_base64.
2-2) we don't store the admin password in adm.conf; removed calling update_adm_conf.
2-3) if any of the updates fails (sie password in DS, in admpw, and uid=admin
password in DS), recover the old password to keep the passwords in sync.
3) eliminated update_adm_conf.
Index: mod_admserv.c
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mod_admserv.c 17 May 2006 00:01:55 -0000 1.24
+++ mod_admserv.c 15 Jun 2006 17:00:29 -0000 1.25
@@ -81,6 +81,8 @@
#define RUNTIME_COMMAND_BASE (char*)"commands/"
#define AUTH_URI "/admin-serv/authenticate"
+#define NETSCAPE_ROOT_BASEDN (char*)"o=NetscapeRoot"
+
/* Globals...hack. */
static char *serverroot = NULL;
static long cacheLifetime = 0; /* Defaults to 0 (entries immediately expire) */
@@ -1135,13 +1137,106 @@
* Miodrag (06-15-98)
* The following metthod is called from the runtime command
* "change_sie_password" after the sie password is changed
+ *
+ * Return value: if successful, 1; otherwise, 0 is returned.
*/
-static void
-task_update_registry_server_bindpw(char *password)
+static int
+task_update_registry_server_bindpw(char *uid, char *password, char* bindpw)
{
- if (registryServer.bindPW)
- free(registryServer.bindPW);
- registryServer.bindPW = password;
+ LDAP *ld;
+ int ldapError;
+ char *filter = NULL;
+ char *userDN = NULL;
+ LDAPMessage *result;
+ LDAPMod mod, *mods[2];
+ char *vals[2];
+ char *attrs[2];
+ int rval = 0;
+
+ /* update password for uid */
+ if (!(ld = openLDAPConnection(®istryServer))) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+ "task_update_registry_server_bindpw(): cannot connect to the Configuration Directory Server");
+ return rval;
+ }
+
+ filter = (char *)malloc(strlen(uid) + 5); /* "uid=<uid>" */
+ if (NULL == filter) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+ "task_update_registry_server_bindpw(): cannot allocate %d byte memory",
+ strlen(uid) + 5);
+ goto bailout;
+ }
+ attrs[0] = "dn"; /* we just need dn ... */
+ attrs[1] = NULL;
+ sprintf(filter, "uid=%s", uid);
+ ldapError = ldap_search_s(ld, NETSCAPE_ROOT_BASEDN, LDAP_SCOPE_SUBTREE,
+ filter, attrs, 0, &result);
+ if (ldapError != LDAP_SUCCESS || ldap_count_entries(ld, result) == 0) {
+ ldap_msgfree(result);
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+ "task_update_registry_server_bindpw(): ldap_search %s under %s failed: %s",
+ filter, NETSCAPE_ROOT_BASEDN, ldap_err2string(ldapError));
+ goto bailout;
+ } else {
+ LDAPMessage *entry = ldap_first_entry(ld, result);
+ userDN = ldap_get_dn(ld, entry);
+ ldap_msgfree(result);
+ }
+ if (NULL == userDN || 0 == strlen(userDN)) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+ "task_update_registry_server_bindpw(): ldap_search %s under %s returned %s",
+ filter, NETSCAPE_ROOT_BASEDN, userDN?"empty string":"NULL");
+ goto bailout;
+ }
+
+ /* authenticate to LDAP server */
+ if (LDAP_SUCCESS != (ldapError = ldap_simple_bind_s(ld, userDN, bindpw))) {
+ switch (ldapError) {
+ case LDAP_INAPPROPRIATE_AUTH:
+ case LDAP_INVALID_CREDENTIALS:
+ case LDAP_INSUFFICIENT_ACCESS:
+ /* authenticate failed: Should not continue */
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+ "task_update_registry_server_bindpw(): failed to authenticate as %s: %s",
+ userDN, ldap_err2string(ldapError));
+ goto bailout;
+ case LDAP_NO_SUCH_OBJECT:
+ case LDAP_ALIAS_PROBLEM:
+ case LDAP_INVALID_DN_SYNTAX:
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+ "task_update_registry_server_bindpw(): bad userdn %s: %s",
+ userDN, ldap_err2string(ldapError));
+ goto bailout;
+ default:
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+ "task_update_registry_server_bindpw(): ldap error %s",
+ ldap_err2string(ldapError));
+ goto bailout;
+ }
+ }
+
+ mod.mod_op = LDAP_MOD_REPLACE;
+ mod.mod_type = "userPassword";
+ vals[0] = password;
+ vals[1] = NULL;
+ mod.mod_values = vals;
+ mods[0] = &mod;
+ mods[1] = NULL;
+ if (LDAP_SUCCESS != (ldapError = ldap_modify_s(ld, userDN, mods))) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+ "task_update_registry_server_bindpw(): ldap_modify for %s failed: %s",
+ userDN, ldap_err2string(ldapError));
+ goto bailout;
+ }
+
+ registryServer.bindPW = password;
+ rval = 1;
+bailout:
+ closeLDAPConnection(ld);
+ if (NULL != filter)
+ free(filter);
+ return rval;
}
/*
@@ -1155,8 +1250,11 @@
char *newpw=query;
char filename[BIG_LINE];
char inbuf[BIG_LINE];
- char outbuf[32];
+ char outbuf[64]; /* needs at least 36 bytes */
char path[PATH_MAX];
+ char *origpw = apr_table_get(r->notes, RQ_NOTES_USERPW);
+ int ds_done = 0;
+ int admpwd_done = 0;
apr_snprintf(path, sizeof(path), "%s%cadmin-serv%cconfig",
serverroot, FILE_PATHSEP, FILE_PATHSEP);
@@ -1192,19 +1290,36 @@
uid = inbuf; *col=0; pw=col+1;
if (!update_ds(path, newpw, r)) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+ "failed to update siepwd on DS");
return 0;
}
- if (!update_adm_conf(path, newpw)) {
- return 0;
- }
-
+ ds_done = 1;
apr_sha1_base64(newpw, strlen(newpw), outbuf);
if (!update_admpwd(path, uid, outbuf)) {
- return 0;
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+ "failed to update admpw");
+ goto recover;
}
+ admpwd_done = 1;
- task_update_registry_server_bindpw(strdup(newpw));
+ if (!task_update_registry_server_bindpw(uid, strdup(newpw), origpw)) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+ "failed to update server bindpw");
+ goto recover;
+ }
+ apr_table_set(r->notes, RQ_NOTES_USERPW, newpw);
return 1;
+
+recover:
+ if (ds_done) {
+ update_ds(path, origpw, r);
+ }
+ if (admpwd_done) {
+ apr_sha1_base64(origpw, strlen(origpw), outbuf);
+ update_admpwd(path, uid, outbuf);
+ }
+ return 0;
}
/*
@@ -1243,57 +1358,6 @@
}
/*
- * Modify adm.conf
- */
-static int
-update_adm_conf(char *admroot, char *newpw)
-{
- FILE *f;
- int i, modified=0;
- static char filename[BIG_LINE];
- char buf[80];
- int linecnt=0;
- char *lines[50];
- static char inbuf[BIG_LINE];
-
- apr_snprintf(filename, sizeof(filename), "%s/adm.conf", admroot);
-
- f = fopen(filename, "r");
- if (f==NULL) {
- return 0;
- }
-
- while(fgets(inbuf, sizeof(inbuf), f) != NULL) {
- if (strstr(inbuf,"siepid:") == inbuf) { /* Line starts with "Password:" */
- apr_snprintf(buf, sizeof(buf), "siepid: %s\n", newpw);
- lines[linecnt++] = strdup(buf);
- modified=1;
- } else {
- lines[linecnt++] = strdup(inbuf);
- }
- }
- fclose(f);
-
- if (!modified) {
- admSetCachedSIEPWD(newpw);
-
- return 1;
- }
-
- f = fopen(filename, "w");
- if (f==NULL) {
- return 0;
- }
-
- for (i=0; i < linecnt; i++) {
- fprintf(f, "%s", lines[i]);
- }
-
- fclose(f);
- return 1;
-}
-
-/*
* Modify userpassword in the DS
*/
static int
@@ -2594,8 +2658,6 @@
/* Cache lookup failed, or cache entry is expired. Try DS. */
/* First try o=NetscapeRoot in the registry server */
-# define NETSCAPE_ROOT_BASEDN (char*)"o=NetscapeRoot"
-
ret = authenticate_user(®istryServer, NETSCAPE_ROOT_BASEDN, r->user, sent_pw, r);
if (ret != DECLINED) {
return OK;
17 years, 9 months
[Fedora-directory-commits] adminserver nsconfig.mk,1.29,1.30
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15675
Modified Files:
nsconfig.mk
Log Message:
[195258] Changes for the internal build
adjusted admservconsole macro.
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nsconfig.mk 23 May 2006 22:13:36 -0000 1.29
+++ nsconfig.mk 15 Jun 2006 01:30:48 -0000 1.30
@@ -944,8 +944,8 @@
CONSOLE_JAR_DIR = $(CLASS_DEST)
endif
-ifdef ADMSERVCONSOLE_SOURCE_ROOT
- ADMSERVCONSOLE_JAR_DIR = $(ADMSERVCONSOLE_SOURCE_ROOT)/built/package
+ifdef ADMSERVCONSOLE_SOURCE_DIR
+ ADMSERVCONSOLE_JAR_DIR = $(ADMSERVCONSOLE_SOURCE_DIR)/built/package
else
ADMSERVCONSOLE_JAR_DIR = $(CLASS_DEST)
endif
17 years, 9 months
[Fedora-directory-commits] adminserver components.mk,1.50,1.51
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15627
Modified Files:
components.mk
Log Message:
[195258] Changes for the internal build
NSPR version: v4.6 -> v4.6.2
NSS version: NSS_3_11_RTM -> NSS_3_11_1_RTM
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- components.mk 23 May 2006 22:13:36 -0000 1.50
+++ components.mk 15 Jun 2006 01:29:14 -0000 1.51
@@ -54,7 +54,7 @@
# NSPR Library
############################################
-NSPR_RELDATE = v4.6
+NSPR_RELDATE = v4.6.2
NSPR_NSOBJDIR=$(NSOBJDIR_NAME)
@@ -85,7 +85,7 @@
# SECURITY LIBRARY
################################################
-SECURITY_RELDATE = NSS_3_11_RTM
+SECURITY_RELDATE = NSS_3_11_1_RTM
ifeq ($(INT_NSS), 1)
BASE_NSS = $(INT_DIR)/nss/$(SECURITY_RELDATE)
17 years, 9 months
[Fedora-directory-commits] setuputil component_versions.mk,1.3,1.4
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15582
Modified Files:
component_versions.mk
Log Message:
[195258] Changes for the internal build
NSPR version: v4.6 -> v4.6.2
NSS version: NSS_3_11_RTM -> NSS_3_11_1_RTM
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/component_versions.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- component_versions.mk 23 Feb 2006 22:50:21 -0000 1.3
+++ component_versions.mk 15 Jun 2006 01:27:34 -0000 1.4
@@ -34,12 +34,12 @@
# naming scheme.
# NSPR
ifndef NSPR_RELDATE
- NSPR_RELDATE = v4.6
+ NSPR_RELDATE = v4.6.2
endif
# SECURITY (NSS) LIBRARY
ifndef SECURITY_RELDATE
- SECURITY_RELDATE = NSS_3_11_RTM
+ SECURITY_RELDATE = NSS_3_11_1_RTM
endif
# DBM Library
17 years, 9 months