From fedora-directory-commits at redhat.com Fri Dec 2 21:30:17 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 2 Dec 2005 16:30:17 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/comm Handler.java, 1.1.1.1, NONE Message-ID: <200512022130.jB2LUHOR005326@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/console/src/com/netscape/management/client/comm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5215/console/src/com/netscape/management/client/comm Removed Files: Handler.java Log Message: Fixes to allow the console to build with gcj/classpath. NOTE: You need a later version of Classpath than the one included with Fedora Core 4 in order to build with these changes. But these changes work fine with Sun or IBM 1.4.2 or later javac. Bug 170577 Bug 170823 Bug 171051 Thanks to Lillian Angel for the contribution. --- Handler.java DELETED --- From fedora-directory-commits at redhat.com Fri Dec 2 21:30:33 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 2 Dec 2005 16:30:33 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/nmclf SuiLookAndFeel.java, 1.1.1.1, 1.2 SuiTreeUI.java, 1.1.1.1, 1.2 Message-ID: <200512022130.jB2LUXhM005369@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/console/src/com/netscape/management/nmclf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5215/console/src/com/netscape/management/nmclf Modified Files: SuiLookAndFeel.java SuiTreeUI.java Log Message: Fixes to allow the console to build with gcj/classpath. NOTE: You need a later version of Classpath than the one included with Fedora Core 4 in order to build with these changes. But these changes work fine with Sun or IBM 1.4.2 or later javac. Bug 170577 Bug 170823 Bug 171051 Thanks to Lillian Angel for the contribution. Index: SuiLookAndFeel.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/nmclf/SuiLookAndFeel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- SuiLookAndFeel.java 18 Jul 2005 00:34:28 -0000 1.1.1.1 +++ SuiLookAndFeel.java 2 Dec 2005 21:30:25 -0000 1.2 @@ -24,15 +24,9 @@ import javax.swing.*; import javax.swing.border.*; import javax.swing.plaf.basic.*; -import com.sun.java.swing.plaf.windows.*; import javax.swing.plaf.*; -import javax.swing.text.JTextComponent; -import javax.swing.text.DefaultEditorKit; -import java.awt.event.KeyEvent; -import java.awt.event.InputEvent; -import java.util.*; +import javax.swing.plaf.metal.*; -import java.net.URL; import java.io.Serializable; import com.netscape.management.client.util.*; @@ -49,7 +43,7 @@ * @author Ben fry * @author Andy Hakim */ -public class SuiLookAndFeel extends WindowsLookAndFeel implements Serializable, SuiConstants +public class SuiLookAndFeel extends MetalLookAndFeel implements Serializable, SuiConstants { public static final boolean _isWindows = System.getProperty("os.name").startsWith("Windows"); Index: SuiTreeUI.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/nmclf/SuiTreeUI.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- SuiTreeUI.java 18 Jul 2005 00:34:28 -0000 1.1.1.1 +++ SuiTreeUI.java 2 Dec 2005 21:30:25 -0000 1.2 @@ -20,16 +20,11 @@ package com.netscape.management.nmclf; import java.awt.*; -import java.awt.event.*; - -import java.io.*; -import java.util.*; import javax.swing.*; import javax.swing.plaf.*; import javax.swing.tree.*; import javax.swing.plaf.basic.*; -import com.sun.java.swing.plaf.windows.*; /** * A UI for JTree. The original intent was to use curved lines From fedora-directory-commits at redhat.com Fri Dec 2 21:30:06 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 2 Dec 2005 16:30:06 -0500 Subject: [Fedora-directory-commits] console build.xml,1.8,1.9 Message-ID: <200512022130.jB2LUaeJ005372@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5215/console Modified Files: build.xml Log Message: Fixes to allow the console to build with gcj/classpath. NOTE: You need a later version of Classpath than the one included with Fedora Core 4 in order to build with these changes. But these changes work fine with Sun or IBM 1.4.2 or later javac. Bug 170577 Bug 170823 Bug 171051 Thanks to Lillian Angel for the contribution. Index: build.xml =================================================================== RCS file: /cvs/dirsec/console/build.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- build.xml 29 Nov 2005 18:36:50 -0000 1.8 +++ build.xml 2 Dec 2005 21:29:58 -0000 1.9 @@ -35,6 +35,7 @@ + @@ -174,6 +175,7 @@ deprecation="${compile.deprecation}" optimize="${compile.optimize}" verbose="no" + fork="true" excludes="**/CVS/**"> From fedora-directory-commits at redhat.com Fri Dec 2 21:30:11 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 2 Dec 2005 16:30:11 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client AboutDialog.java, 1.3, 1.4 ResourceCellRenderer.java, 1.1.1.1, 1.2 Message-ID: <200512022130.jB2LUffB005377@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/console/src/com/netscape/management/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5215/console/src/com/netscape/management/client Modified Files: AboutDialog.java ResourceCellRenderer.java Log Message: Fixes to allow the console to build with gcj/classpath. NOTE: You need a later version of Classpath than the one included with Fedora Core 4 in order to build with these changes. But these changes work fine with Sun or IBM 1.4.2 or later javac. Bug 170577 Bug 170823 Bug 171051 Thanks to Lillian Angel for the contribution. Index: AboutDialog.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/AboutDialog.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AboutDialog.java 26 Oct 2005 23:16:15 -0000 1.3 +++ AboutDialog.java 2 Dec 2005 21:30:04 -0000 1.4 @@ -25,7 +25,6 @@ import java.awt.*; import com.netscape.management.client.util.*; -import com.netscape.management.nmclf.SuiConstants; /** * AboutDialog is a class to display a standard "about box", Index: ResourceCellRenderer.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/ResourceCellRenderer.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ResourceCellRenderer.java 18 Jul 2005 00:34:07 -0000 1.1.1.1 +++ ResourceCellRenderer.java 2 Dec 2005 21:30:04 -0000 1.2 @@ -19,15 +19,10 @@ * END COPYRIGHT BLOCK **/ package com.netscape.management.client; -import java.util.*; import java.awt.*; -import java.awt.event.*; import javax.swing.*; -import javax.swing.event.*; import javax.swing.tree.*; -import javax.swing.border.*; import javax.swing.plaf.basic.*; -import com.netscape.management.client.util.*; /** * A specialized tree cell renderer for use with the ResourcePage tree. @@ -123,13 +118,15 @@ public void paint(Graphics g) { Color backgroundColor; Icon icon = getIcon(); - int iconTextGap = getIconTextGap() - 2; + int iconTextGap = getIconTextGap(); + String s = getText(); int offset = 0; - int width = getWidth(); - int height = getHeight(); - - if (iconTextGap < 0) - iconTextGap = 0; + int width = 0; + FontMetrics fm = getToolkit().getFontMetrics(getFont()); + + if (s != null) + width = SwingUtilities.computeStringWidth(fm, s); + int height = fm.getHeight() + 2; if (icon != null) offset = icon.getIconWidth() + iconTextGap; @@ -146,9 +143,9 @@ g.setColor(backgroundColor); if (icon != null && getText() != null) { - g.fillRect(offset + 1, 1, width - 2 - offset, height - 2); + g.fillRect(offset + 1, 1, width, height); } else { - g.fillRect(1, 1, width - 2 - offset, height - 2); + g.fillRect(1, 1, width, height); } super.paint(g); @@ -157,10 +154,10 @@ if (_hasFocus) { g.setColor(Color.black); // TODO: hard-coded value BasicGraphicsUtils.drawDashedRect(g, offset, 0, - width - 1 - offset, height); + width, height); } else { g.setColor(backgroundColor); - g.drawRect(offset, 0, width - 1 - offset, height - 1); + g.drawRect(offset, 0, width, height); } } } From fedora-directory-commits at redhat.com Fri Dec 2 21:30:22 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 2 Dec 2005 16:30:22 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/console Console.java, 1.3, 1.4 Message-ID: <200512022130.jB2LUrwM005380@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/console/src/com/netscape/management/client/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5215/console/src/com/netscape/management/client/console Modified Files: Console.java Log Message: Fixes to allow the console to build with gcj/classpath. NOTE: You need a later version of Classpath than the one included with Fedora Core 4 in order to build with these changes. But these changes work fine with Sun or IBM 1.4.2 or later javac. Bug 170577 Bug 170823 Bug 171051 Thanks to Lillian Angel for the contribution. Index: Console.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Console.java 29 Nov 2005 18:36:56 -0000 1.3 +++ Console.java 2 Dec 2005 21:30:15 -0000 1.4 @@ -28,8 +28,6 @@ import java.net.MalformedURLException; import javax.swing.*; -import javax.swing.event.*; -import javax.swing.border.*; import com.netscape.management.nmclf.*; import com.netscape.management.client.*; @@ -151,7 +149,7 @@ if (!_useJavaLookAndFeel) { SuiLookAndFeel nmclf = new SuiLookAndFeel(); - UIManager.setLookAndFeel(nmclf); + UIManager.setLookAndFeel((LookAndFeel)nmclf); // With JDK1.4 on Unix, the first instance of JFileChooser // has an incorrect layout for some of the buttons. Create From fedora-directory-commits at redhat.com Fri Dec 2 21:30:27 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 2 Dec 2005 16:30:27 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/util AbstractDialog.java, 1.1.1.1, 1.2 Message-ID: <200512022130.jB2LUwP5005383@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/console/src/com/netscape/management/client/util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5215/console/src/com/netscape/management/client/util Modified Files: AbstractDialog.java Log Message: Fixes to allow the console to build with gcj/classpath. NOTE: You need a later version of Classpath than the one included with Fedora Core 4 in order to build with these changes. But these changes work fine with Sun or IBM 1.4.2 or later javac. Bug 170577 Bug 170823 Bug 171051 Thanks to Lillian Angel for the contribution. Index: AbstractDialog.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/AbstractDialog.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- AbstractDialog.java 18 Jul 2005 00:34:25 -0000 1.1.1.1 +++ AbstractDialog.java 2 Dec 2005 21:30:20 -0000 1.2 @@ -240,7 +240,7 @@ } c.setBackground(UIManager.getColor("control")); - c.setForeground(UIManager.getColor("text")); + c.setForeground(UIManager.getColor("textText")); } protected void finalize() throws Throwable { From fedora-directory-commits at redhat.com Sat Dec 3 01:45:43 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 2 Dec 2005 20:45:43 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd log.c, 1.7, 1.8 log.h, 1.4, 1.5 proto-slap.h, 1.12, 1.13 Message-ID: <200512030145.jB31jh12013920@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13890 Modified Files: log.c log.h proto-slap.h Log Message: [173931] Error logs not deleted When reading a rotation info file, compare the contents with the files in the logs dir, if mismatch is found, update the rotation info file. Once the files arestored in the rotation info file, they will be the target of cleanup at the nextlog ration. Index: log.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- log.c 23 Nov 2005 17:58:01 -0000 1.7 +++ log.c 3 Dec 2005 01:45:34 -0000 1.8 @@ -56,6 +56,9 @@ #include "proto-ntutil.h" extern HANDLE hSlapdEventSource; extern LPTSTR pszServerName; +#define _PSEP '\\' +#else +#define _PSEP '/' #endif /************************************************************************** * GLOBALS, defines, and ... @@ -112,12 +115,14 @@ static int log__error_rotationinfof(char *pathname); static int log__audit_rotationinfof(char *pathname); static int log__extract_logheader (FILE *fp, long *f_ctime, int *f_size); +static int log__check_prevlogs (FILE *fp, char *filename); static int log__getfilesize(LOGFD fp); static int log__enough_freespace(char *path); static int vslapd_log_error(LOGFD fp, char *subsystem, char *fmt, va_list ap ); static int vslapd_log_access(char *fmt, va_list ap ); static void log_convert_time (time_t ctime, char *tbuf, int type); +static time_t log_reverse_convert_time (char *tbuf); static LogBufferInfo *log_create_buffer(size_t sz); static void log_append_buffer2(time_t tnl, LogBufferInfo *lbi, char *msg1, size_t size1, char *msg2, size_t size2); static void log_flush_buffer(LogBufferInfo *lbi, int type, int sync_now); @@ -2126,8 +2131,8 @@ logp = loginfo.log_access_logchain; while ( logp) { log_convert_time (logp->l_ctime, tbuf, 1 /*short*/); - PR_snprintf(buffer, sizeof(buffer), "LOGINFO:Previous Log File:%s.%s (%lu) (%u)\n", - loginfo.log_access_file, tbuf, logp->l_ctime, logp->l_size); + PR_snprintf(buffer, sizeof(buffer), "LOGINFO:%s%s.%s (%lu) (%u)\n", + PREVLOGFILE, loginfo.log_access_file, tbuf, logp->l_ctime, logp->l_size); LOG_WRITE(fpinfo, buffer, strlen(buffer), 0); logp = logp->l_next; } @@ -2427,6 +2432,130 @@ return 1; } + +#define ERRORSLOG 1 +#define ACCESSLOG 2 +#define AUDITLOG 3 + +static int +log__fix_rotationinfof(char *pathname) +{ + char *logsdir = NULL; + time_t now; + PRDir *dirptr = NULL; + PRDirEntry *dirent = NULL; + PRDirFlags dirflags = PR_SKIP_BOTH & PR_SKIP_HIDDEN; + char *log_type = NULL; + int log_type_id; + int rval = LOG_ERROR; + char *p; + + /* rotation info file is broken; can't trust the contents */ + time (&now); + loginfo.log_error_ctime = now; + logsdir = slapi_ch_strdup(pathname); + p = strrchr(logsdir, _PSEP); + if (NULL == p) /* pathname is not path/filename.rotationinfo; do nothing */ + goto done; + + *p = '\0'; + log_type = ++p; + p = strchr(log_type, '.'); + if (NULL == p) /* file is not rotationinfo; do nothing */ + goto done; + *p = '\0'; + + if (0 == strcmp(log_type, "errors")) + log_type_id = ERRORSLOG; + else if (0 == strcmp(log_type, "access")) + log_type_id = ACCESSLOG; + else if (0 == strcmp(log_type, "audit")) + log_type_id = AUDITLOG; + else + goto done; /* file is not errors nor access nor audit; do nothing */ + + if (!(dirptr = PR_OpenDir(logsdir))) + goto done; + + switch (log_type_id) { + case ERRORSLOG: + loginfo.log_numof_error_logs = 0; + loginfo.log_error_logchain = NULL; + break; + case ACCESSLOG: + loginfo.log_numof_access_logs = 0; + loginfo.log_access_logchain = NULL; + break; + case AUDITLOG: + loginfo.log_numof_audit_logs = 0; + loginfo.log_audit_logchain = NULL; + break; + } + /* read the directory entries into an ascii sorted avl tree */ + for (dirent = PR_ReadDir(dirptr, dirflags); dirent ; + dirent = PR_ReadDir(dirptr, dirflags)) { + if (0 == strcmp(log_type, dirent->name)) { + switch (log_type_id) { + case ERRORSLOG: + loginfo.log_numof_error_logs++; + break; + case ACCESSLOG: + loginfo.log_numof_access_logs++; + break; + case AUDITLOG: + loginfo.log_numof_audit_logs++; + break; + } + } else if (0 == strncmp(log_type, dirent->name, strlen(log_type)) && + (p = strrchr(dirent->name, '.')) != NULL && + 15 == strlen(++p) && + NULL != strchr(p, '-')) { /* e.g., errors.20051123-165135 */ + struct logfileinfo *logp; + char *q; + int ignoreit = 0; + + for (q = p; q && *q; q++) { + if (*q != '-' && !isdigit(*q)) + ignoreit = 1; + } + if (ignoreit) + continue; + + logp = (struct logfileinfo *) slapi_ch_malloc (sizeof (struct logfileinfo)); + logp->l_ctime = log_reverse_convert_time(p); + switch (log_type_id) { + case ERRORSLOG: + logp->l_size = loginfo.log_error_maxlogsize; /* dummy */ + logp->l_next = loginfo.log_error_logchain; + loginfo.log_error_logchain = logp; + loginfo.log_numof_error_logs++; + break; + case ACCESSLOG: + logp->l_size = loginfo.log_access_maxlogsize; + logp->l_next = loginfo.log_access_logchain; + loginfo.log_access_logchain = logp; + loginfo.log_numof_access_logs++; + break; + case AUDITLOG: + logp->l_size =loginfo.log_audit_maxlogsize; + logp->l_next = loginfo.log_audit_logchain; + loginfo.log_audit_logchain = logp; + loginfo.log_numof_audit_logs++; + break; + } + } + } + rval = LOG_SUCCESS; +done: + if (NULL != dirptr) + PR_CloseDir(dirptr); + slapi_ch_free_string(&logsdir); + return rval; +} +#undef ERRORSLOG +#undef ACCESSLOG +#undef AUDITLOG + /****************************************************************************** * log__access_rotationinfof * @@ -2436,14 +2565,14 @@ * Assumption: Lock has been acquired already ******************************************************************************/ static int -log__access_rotationinfof( char *pathname) +log__access_rotationinfof(char *pathname) { - long f_ctime; + long f_ctime; int f_size; int main_log = 1; - time_t now; - FILE *fp; - + time_t now; + FILE *fp; + int rval, logfile_type = LOGFILE_REOPENED; /* ** Okay -- I confess, we want to use NSPR calls but I want to @@ -2462,7 +2591,7 @@ ** We have reopened the log access file. Now we need to read the ** log file info and update the values. */ - while (log__extract_logheader(fp, &f_ctime, &f_size) == LOG_CONTINUE) { + while ((rval = log__extract_logheader(fp, &f_ctime, &f_size)) == LOG_CONTINUE) { /* first we would get the main log info */ if (f_ctime == 0 && f_size == 0) continue; @@ -2479,15 +2608,15 @@ struct logfileinfo *logp; logp = (struct logfileinfo *) slapi_ch_malloc (sizeof (struct logfileinfo)); - if (f_ctime > 0L) + if (f_ctime > 0L) logp->l_ctime = f_ctime; else logp->l_ctime = now; if (f_size > 0) - logp->l_size = f_size; + logp->l_size = f_size; else { /* make it the max log size */ - logp->l_size = loginfo.log_access_maxlogsize; + logp->l_size = loginfo.log_access_maxlogsize; } logp->l_next = loginfo.log_access_logchain; @@ -2495,6 +2624,13 @@ } loginfo.log_numof_access_logs++; } + if (LOG_DONE == rval) + rval = log__check_prevlogs(fp, pathname); + fclose (fp); + + if (LOG_ERROR == rval) + if (LOG_SUCCESS == log__fix_rotationinfof(pathname)) + logfile_type = LOGFILE_NEW; /* Check if there is a rotation overdue */ if (loginfo.log_access_rotationsync_enabled && @@ -2503,8 +2639,79 @@ loginfo.log_access_ctime < loginfo.log_access_rotationsyncclock - loginfo.log_access_rotationtime_secs) { loginfo.log_access_rotationsyncclock -= loginfo.log_access_rotationtime_secs; } - fclose (fp); - return LOGFILE_REOPENED; + return logfile_type; +} + +/* +* log__check_prevlogs +* +* check if a given prev log file (e.g., /opt/fedora-ds/slapd-fe/logs/errors.20051201-101347) +* is found in the rotationinfo file. +*/ +static int +log__check_prevlogs (FILE *fp, char *pathname) +{ + char buf[BUFSIZ], *p; + char *logsdir = NULL; + int rval = LOG_CONTINUE; + char *log_type = NULL; + PRDir *dirptr = NULL; + PRDirEntry *dirent = NULL; + PRDirFlags dirflags = PR_SKIP_BOTH & PR_SKIP_HIDDEN; + + logsdir = slapi_ch_strdup(pathname); + p = strrchr(logsdir, _PSEP); + if (NULL == p) /* pathname is not path/filename.rotationinfo; do nothing */ + goto done; + + *p = '\0'; + log_type = ++p; + p = strchr(log_type, '.'); + if (NULL == p) /* file is not rotationinfo; do nothing */ + goto done; + *p = '\0'; + + if (0 != strcmp(log_type, "errors") && + 0 != strcmp(log_type, "access") && + 0 != strcmp(log_type, "audit")) + goto done; /* file is not errors nor access nor audit; do nothing */ + + if (!(dirptr = PR_OpenDir(logsdir))) + goto done; + + for (dirent = PR_ReadDir(dirptr, dirflags); dirent ; + dirent = PR_ReadDir(dirptr, dirflags)) { + if (0 == strncmp(log_type, dirent->name, strlen(log_type)) && + (p = strrchr(dirent->name, '.')) != NULL && + 15 == strlen(++p) && + NULL != strchr(p, '-')) { /* e.g., errors.20051123-165135 */ + char *q; + int ignoreit = 0; + + for (q = p; q && *q; q++) { + if (*q != '-' && !isdigit(*q)) + ignoreit = 1; + } + if (ignoreit) + continue; + + fseek(fp, 0 ,SEEK_SET); + buf[BUFSIZ-1] = '\0'; + while (fgets(buf, BUFSIZ - 1, fp)) { + if (strstr(buf, dirent->name)) { + rval = LOG_CONTINUE; /* found in .rotationinfo */ + continue; + } + } + rval = LOG_ERROR; /* not found in .rotationinfo */ + break; + } + } +done: + if (NULL != dirptr) + PR_CloseDir(dirptr); + slapi_ch_free_string(&logsdir); + return rval; } /****************************************************************************** @@ -2526,8 +2733,9 @@ if ( fp == NULL) return LOG_ERROR; - if (fgets(buf, BUFSIZ, fp) == NULL) { - return LOG_ERROR; + buf[BUFSIZ-1] = '\0'; /* for safety */ + if (fgets(buf, BUFSIZ - 1, fp) == NULL) { + return LOG_DONE; } if ((p=strstr(buf, "LOGINFO")) == NULL) { @@ -2566,6 +2774,23 @@ /* Now p must hold the size value */ *f_size = atoi(p); + /* check if the Previous Log file really exists */ + if ((p = strstr(buf, PREVLOGFILE)) != NULL) { + p += strlen(PREVLOGFILE); + s = strchr(p, ' '); + if (NULL == s) { + s = strchr(p, '('); + if (NULL != s) { + *s = '\0'; + } + } else { + *s = '\0'; + } + if (PR_SUCCESS != PR_Access(p, PR_ACCESS_EXISTS)) { + return LOG_ERROR; + } + } + return LOG_CONTINUE; } @@ -2717,13 +2942,17 @@ default: return NULL; } - list = (char **) slapi_ch_calloc(1, num * sizeof(char *)); + list = (char **) slapi_ch_calloc(1, (num + 1) * sizeof(char *)); i = 0; while (logp) { log_convert_time (logp->l_ctime, tbuf, 1 /*short */); PR_snprintf(buf, sizeof(buf), "%s.%s", file, tbuf); list[i] = slapi_ch_strdup(buf); i++; + if (i == num) { /* mismatch b/w num and logchain; + cut the chain and save the process */ + break; + } logp = logp->l_next; } list[i] = NULL; @@ -3059,12 +3288,12 @@ static int log__error_rotationinfof( char *pathname) { - long f_ctime; + long f_ctime; int f_size; int main_log = 1; - time_t now; - FILE *fp; - + time_t now; + FILE *fp; + int rval, logfile_type = LOGFILE_REOPENED; /* ** Okay -- I confess, we want to use NSPR calls but I want to @@ -3083,7 +3312,7 @@ ** We have reopened the log error file. Now we need to read the ** log file info and update the values. */ - while (log__extract_logheader(fp, &f_ctime, &f_size) == LOG_CONTINUE) { + while ((rval = log__extract_logheader(fp, &f_ctime, &f_size)) == LOG_CONTINUE) { /* first we would get the main log info */ if (f_ctime == 0 && f_size == 0) continue; @@ -3100,15 +3329,15 @@ struct logfileinfo *logp; logp = (struct logfileinfo *) slapi_ch_malloc (sizeof (struct logfileinfo)); - if (f_ctime > 0L) + if (f_ctime > 0L) logp->l_ctime = f_ctime; else logp->l_ctime = now; if (f_size > 0) - logp->l_size = f_size; + logp->l_size = f_size; else { /* make it the max log size */ - logp->l_size = loginfo.log_error_maxlogsize; + logp->l_size = loginfo.log_error_maxlogsize; } logp->l_next = loginfo.log_error_logchain; @@ -3116,6 +3345,13 @@ } loginfo.log_numof_error_logs++; } + if (LOG_DONE == rval) + rval = log__check_prevlogs(fp, pathname); + fclose (fp); + + if (LOG_ERROR == rval) + if (LOG_SUCCESS == log__fix_rotationinfof(pathname)) + logfile_type = LOGFILE_NEW; /* Check if there is a rotation overdue */ if (loginfo.log_error_rotationsync_enabled && @@ -3125,8 +3361,7 @@ loginfo.log_error_rotationsyncclock -= loginfo.log_error_rotationtime_secs; } - fclose (fp); - return LOGFILE_REOPENED; + return logfile_type; } /****************************************************************************** @@ -3140,12 +3375,12 @@ static int log__audit_rotationinfof( char *pathname) { - long f_ctime; + long f_ctime; int f_size; int main_log = 1; - time_t now; - FILE *fp; - + time_t now; + FILE *fp; + int rval, logfile_type = LOGFILE_REOPENED; /* ** Okay -- I confess, we want to use NSPR calls but I want to @@ -3164,7 +3399,7 @@ ** We have reopened the log audit file. Now we need to read the ** log file info and update the values. */ - while (log__extract_logheader(fp, &f_ctime, &f_size) == LOG_CONTINUE) { + while ((rval = log__extract_logheader(fp, &f_ctime, &f_size)) == LOG_CONTINUE) { /* first we would get the main log info */ if (f_ctime == 0 && f_size == 0) continue; @@ -3181,15 +3416,15 @@ struct logfileinfo *logp; logp = (struct logfileinfo *) slapi_ch_malloc (sizeof (struct logfileinfo)); - if (f_ctime > 0L) + if (f_ctime > 0L) logp->l_ctime = f_ctime; else logp->l_ctime = now; if (f_size > 0) - logp->l_size = f_size; + logp->l_size = f_size; else { /* make it the max log size */ - logp->l_size = loginfo.log_audit_maxlogsize; + logp->l_size = loginfo.log_audit_maxlogsize; } logp->l_next = loginfo.log_audit_logchain; @@ -3197,6 +3432,13 @@ } loginfo.log_numof_audit_logs++; } + if (LOG_DONE == rval) + rval = log__check_prevlogs(fp, pathname); + fclose (fp); + + if (LOG_ERROR == rval) + if (LOG_SUCCESS == log__fix_rotationinfof(pathname)) + logfile_type = LOGFILE_NEW; /* Check if there is a rotation overdue */ if (loginfo.log_audit_rotationsync_enabled && @@ -3206,8 +3448,7 @@ loginfo.log_audit_rotationsyncclock -= loginfo.log_audit_rotationtime_secs; } - fclose (fp); - return LOGFILE_REOPENED; + return logfile_type; } /****************************************************************************** @@ -3331,8 +3572,8 @@ logp = loginfo.log_error_logchain; while ( logp) { log_convert_time (logp->l_ctime, tbuf, 1 /*short */); - PR_snprintf(buffer, sizeof(buffer), "LOGINFO:Previous Log File:%s.%s (%lu) (%u)\n", - loginfo.log_error_file, tbuf, logp->l_ctime, logp->l_size); + PR_snprintf(buffer, sizeof(buffer), "LOGINFO:%s%s.%s (%lu) (%u)\n", + PREVLOGFILE, loginfo.log_error_file, tbuf, logp->l_ctime, logp->l_size); LOG_WRITE(fpinfo, buffer, strlen(buffer), 0); logp = logp->l_next; } @@ -3452,8 +3693,8 @@ logp = loginfo.log_audit_logchain; while ( logp) { log_convert_time (logp->l_ctime, tbuf, 1 /*short */); - PR_snprintf(buffer, sizeof(buffer), "LOGINFO:Previous Log File:%s.%s (%d) (%d)\n", - loginfo.log_audit_file, tbuf, (int)logp->l_ctime, logp->l_size); + PR_snprintf(buffer, sizeof(buffer), "LOGINFO:%s%s.%s (%d) (%d)\n", + PREVLOGFILE, loginfo.log_audit_file, tbuf, (int)logp->l_ctime, logp->l_size); LOG_WRITE(fpinfo, buffer, strlen(buffer), 0); logp = logp->l_next; } @@ -3624,15 +3865,14 @@ static void log_convert_time (time_t ctime, char *tbuf, int type) { - struct tm *tmsp, tms; #ifdef _WIN32 - { - struct tm *pt = localtime( &ctime ); - tmsp = &tms; - memcpy(&tms, pt, sizeof(struct tm) ); - } + { + struct tm *pt = localtime( &ctime ); + tmsp = &tms; + memcpy(&tms, pt, sizeof(struct tm) ); + } #else (void)localtime_r( &ctime, &tms ); tmsp = &tms; @@ -3641,7 +3881,27 @@ (void) strftime (tbuf, (size_t) TBUFSIZE, "%Y%m%d-%H%M%S",tmsp); else /* wants the long form */ (void) strftime (tbuf, (size_t) TBUFSIZE, "%d/%b/%Y:%H:%M:%S",tmsp); +} + +/* + * log_reverse_convert_time + * convert the given string formatted time (output from log_convert_time) + * into time_t + */ +static time_t +log_reverse_convert_time(char *tbuf) +{ + struct tm tm; + + if (strchr(tbuf, '-')) { /* short format */ + strptime(tbuf, "%Y%m%d-%H%M%S", &tm); + } else if (strchr(tbuf, '/') && strchr(tbuf, ':')) { /* long format */ + strptime(tbuf, "%d/%b/%Y:%H:%M:%S", &tm); + } else { + return 0; + } + return mktime(&tm); } int Index: log.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- log.h 19 Apr 2005 22:07:36 -0000 1.4 +++ log.h 3 Dec 2005 01:45:34 -0000 1.5 @@ -43,6 +43,8 @@ * *************************************************************************/ #include +#define _XOPEN_SOURCE /* glibc2 needs this */ +#define __USE_XOPEN #include #include #include @@ -69,6 +71,7 @@ #define LOG_EXCEEDED 2 /*err: > max logs allowed */ #define LOG_ROTATE 3 /*ok; go to the next log */ #define LOG_UNABLE_TO_OPENFILE 4 +#define LOG_DONE 5 #define LOG_UNIT_UNKNOWN 0 #define LOG_UNIT_MONTHS 1 @@ -91,6 +94,8 @@ #define LOG_BUFFER_MAXSIZE 512 * 1024 +#define PREVLOGFILE "Previous Log File:" + /* see log.c for why this is done */ #ifdef XP_WIN32 typedef FILE *LOGFD; Index: proto-slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- proto-slap.h 23 Nov 2005 17:58:01 -0000 1.12 +++ proto-slap.h 3 Dec 2005 01:45:34 -0000 1.13 @@ -588,7 +588,7 @@ */ void slapd_nasty(char* str, int c, int err); int strarray2str( char **a, char *buf, size_t buflen, int include_quotes ); -int slapd_slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid); +int slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid); /* * modify.c From fedora-directory-commits at redhat.com Sun Dec 4 01:54:46 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Sat, 3 Dec 2005 20:54:46 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd log.c, 1.8, 1.9 log.h, 1.5, 1.6 Message-ID: <200512040154.jB41skEW024236@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24199 Modified Files: log.c log.h Log Message: Fixed the solaris build (log.h); fixed an inappropriate comment Index: log.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- log.c 3 Dec 2005 01:45:34 -0000 1.8 +++ log.c 4 Dec 2005 01:54:37 -0000 1.9 @@ -2491,7 +2491,7 @@ loginfo.log_audit_logchain = NULL; break; } - /* read the directory entries into an ascii sorted avl tree */ + /* read the directory entries into a linked list */ for (dirent = PR_ReadDir(dirptr, dirflags); dirent ; dirent = PR_ReadDir(dirptr, dirflags)) { if (0 == strcmp(log_type, dirent->name)) { Index: log.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- log.h 3 Dec 2005 01:45:34 -0000 1.5 +++ log.h 4 Dec 2005 01:54:37 -0000 1.6 @@ -43,8 +43,10 @@ * *************************************************************************/ #include +#ifdef LINUX #define _XOPEN_SOURCE /* glibc2 needs this */ #define __USE_XOPEN +#endif #include #include #include From fedora-directory-commits at redhat.com Tue Dec 6 18:28:21 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 6 Dec 2005 13:28:21 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm import.c, 1.5, 1.6 import.h, 1.4, 1.5 import-threads.c, 1.8, 1.9 Message-ID: <200512061828.jB6ISLJv018750@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18714 Modified Files: import.c import.h import-threads.c Log Message: [175063] entry with escaped characters fails to import and index If missing entry_id is found, skip it and continue reading the primary db to be reindexed. Index: import.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.c 19 Apr 2005 22:07:38 -0000 1.5 +++ import.c 6 Dec 2005 18:28:14 -0000 1.6 @@ -91,7 +91,7 @@ return 0; } -FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker) +FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker, int shift) { int idx = id % job->fifo.size; FifoItem *fi; @@ -102,7 +102,7 @@ return NULL; } if (fi->entry) { - if (id != fi->entry->ep_id) + if (id != fi->entry->ep_id - shift) fi = NULL; else if (worker) { if (fi->bad) return NULL; Index: import.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.h 19 Apr 2005 22:07:38 -0000 1.4 +++ import.h 6 Dec 2005 18:28:14 -0000 1.5 @@ -201,7 +201,7 @@ /* import.c */ -FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker); +FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker, int shift); void import_free_job(ImportJob *job); void import_log_notice(ImportJob *job, char *format, ...); void import_abort_all(ImportJob *job, int wait_for_them); Index: import-threads.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import-threads.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import-threads.c 28 Apr 2005 17:31:54 -0000 1.8 +++ import-threads.c 6 Dec 2005 18:28:14 -0000 1.9 @@ -986,6 +986,7 @@ int ret = 0; struct attrinfo *parentid_ai; Slapi_PBlock *pb = slapi_pblock_new(); + int shift = 0; PR_ASSERT(info != NULL); PR_ASSERT(inst != NULL); @@ -1027,10 +1028,11 @@ info->state = RUNNING; /* Read that entry from the cache */ - fi = import_fifo_fetch(job, id, 0); + fi = import_fifo_fetch(job, id, 0, shift); if (! fi) { - import_log_notice(job, "ERROR: foreman fifo error"); - goto error; + import_log_notice(job, "WARNING: entry id %d is missing", id); + shift++; + continue; } /* first, fill in any operational attributes */ @@ -1050,7 +1052,7 @@ */ if (job->flags & FLAG_ABORT) { goto error; - } + } if (parent_status == IMPORT_ADD_OP_ATTRS_NO_PARENT) { /* If this entry is a suffix entry, this is not a problem */ @@ -1268,7 +1270,7 @@ info->state = RUNNING; /* Read that entry from the cache */ - fi = import_fifo_fetch(job, id, 1); + fi = import_fifo_fetch(job, id, 1, 0); ep = fi ? fi->entry : NULL; if (!ep) { /* skipping an entry that turned out to be bad */ From fedora-directory-commits at redhat.com Tue Dec 6 18:38:28 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 6 Dec 2005 13:38:28 -0500 Subject: [Fedora-directory-commits] adminutil Makefile, 1.2, 1.3 adminutil.spec.tmpl, 1.2, 1.3 nsconfig.mk, 1.3, 1.4 pkgadminutil.mk, 1.4, 1.5 Message-ID: <200512061838.jB6Icwet018944@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818 Modified Files: Makefile adminutil.spec.tmpl nsconfig.mk pkgadminutil.mk Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminutil/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 16 Nov 2005 18:49:58 -0000 1.2 +++ Makefile 6 Dec 2005 18:38:20 -0000 1.3 @@ -69,6 +69,9 @@ buildnum: if test ! -d $(NSPLATFORM_ID); then mkdir $(NSPLATFORM_ID); fi; $(PERL5) buildnum.pl -p $(NSPLATFORM_ID) + @mybuildnum=`cat $(NSPLATFORM_ID)/buildnum.dat`; \ + sed -e "s/\(ADMSDK_BUILDNUM\).*/\1 $$mybuildnum/" include/version.h > include/version.h.tmp; \ + mv include/version.h.tmp include/version.h $(DIRVER_H): if test ! -d $(DIRVERDIR); then mkdir -p $(DIRVERDIR); fi; Index: adminutil.spec.tmpl =================================================================== RCS file: /cvs/dirsec/adminutil/adminutil.spec.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- adminutil.spec.tmpl 16 Nov 2005 18:49:58 -0000 1.2 +++ adminutil.spec.tmpl 6 Dec 2005 18:38:20 -0000 1.3 @@ -57,22 +57,24 @@ cp -r $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/include $RPM_BUILD_ROOT/%{prefix}/usr %clean -rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil10.so -rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil10.so +rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so* +rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so* rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/adminutil-properties -rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil10.a -rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil10.a rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0 %files %defattr(-,root,root,-) -%{prefix}/usr/lib/libadminutil10.so -%{prefix}/usr/lib/libadmsslutil10.so +%{prefix}/usr/lib/libadminutil.so.1.0 +%{prefix}/usr/lib/libadmsslutil.so.1.0 %{prefix}/usr/lib/adminutil-properties/libadminutil_root.res %pre %post +ln -s $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so.1.0 $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so.1 +ln -s $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so.1.0 $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so +ln -s $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so.1.0 $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so.1 +ln -s $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so.1.0 $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so echo "Install finished." %postun @@ -89,8 +91,6 @@ %files devel %defattr(-,root,root,-) -%{prefix}/usr/lib/libadminutil10.a -%{prefix}/usr/lib/libadmsslutil10.a %{prefix}/usr/include/adminutil-1.0/libadminutil/admutil.h %{prefix}/usr/include/adminutil-1.0/libadminutil/distadm.h %{prefix}/usr/include/adminutil-1.0/libadminutil/prodinfo.h @@ -105,9 +105,6 @@ %{prefix}/usr/include/adminutil-1.0/libadmsslutil/SSLerrs.h %pre devel -mkdir -p $RPM_INSTALL_PREFIX/%{prefix}/usr/lib -mkdir -p $RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0/libadminutil -mkdir -p $RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0/libadmsslutil %postun devel rm -rf $RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0 Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nsconfig.mk 26 Oct 2005 16:35:28 -0000 1.3 +++ nsconfig.mk 6 Dec 2005 18:38:20 -0000 1.4 @@ -158,13 +158,18 @@ #------------------- ifeq ($(ARCH), HPUX) #------------------- -DLL_SUFFIX=sl +HPUX_ARCH = $(shell uname -m) +ifeq ($(HPUX_ARCH), ia64) + DLL_SUFFIX=so +else + DLL_SUFFIX=sl +endif LDAP_DLL_SUFFIX=$(DLL_SUFFIX) ifeq ($(NSOS_RELEASE), B.11.00) - MODERNHP=1 + MODERNHP=1 endif ifeq ($(NSOS_RELEASE), B.11.11) - MODERNHP=1 + MODERNHP=1 endif ifeq ($(MODERNHP), 1) @@ -581,6 +586,8 @@ ######################################## ADMSDK_SO_VERSION=10 +ADMSDK_SO_DOTVERSION=1.0 +ADMSDK_SO_MAJORVERSION=1 ADMSDKOBJDIR=$(OBJDIR) ADMSDK_LIBPATH = $(ADMSDKOBJDIR)/lib ADMSDK_INCLUDE = $(ADMSDKOBJDIR)/include @@ -591,7 +598,7 @@ ADMSDKDLL_NAMES = $(addsuffix .dll, $ADMSDK_LIBNAMES)) ADMSDKLINK = $(addprefix $(ADMSDK_LIBPATH)/, $(ADMSDK_LIBS)) else - ADMSDK_LIBNAMES = adminutil$(ADMSDK_SO_VERSION) + ADMSDK_LIBNAMES = adminutil ADMSDK_LIBS = $(addsuffix .a, $(addprefix lib, $(ADMSDK_LIBNAMES))) LIBADMSDK = $(addprefix $(ADMSDK_LIBPATH)/, $(ADMSDK_LIBS)) ADMSDKLINK = -L$(ADMSDK_LIBPATH) $(addprefix -l, $(ADMSDK_LIBNAMES)) Index: pkgadminutil.mk =================================================================== RCS file: /cvs/dirsec/adminutil/pkgadminutil.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pkgadminutil.mk 16 Nov 2005 18:49:58 -0000 1.4 +++ pkgadminutil.mk 6 Dec 2005 18:38:20 -0000 1.5 @@ -88,7 +88,7 @@ cp -p $(ABS_ROOT)/include/libadmsslutil/*.h $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil # Don't package sslpset.h rm -f $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil/sslpset.h - cp -p $(ADMSERV_OBJDIR)/lib/*.* $(PKGDIR)/lib + cd $(ADMSERV_OBJDIR)/lib; tar cf - *.* | (cd $(PKGDIR)/lib; tar xf -) cp -p $(ADMSERV_OBJDIR)/lib/libadminutil/lib*.res $(PKGDIR)/lib/$(PROP_ADMINUTIL) pkgSBC: From fedora-directory-commits at redhat.com Tue Dec 6 18:38:55 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 6 Dec 2005 13:38:55 -0500 Subject: [Fedora-directory-commits] adminutil/tests Makefile,1.1,1.2 Message-ID: <200512061838.jB6IctNl018936@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil/tests In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818/tests Modified Files: Makefile Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminutil/tests/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 16 Nov 2005 18:50:21 -0000 1.1 +++ Makefile 6 Dec 2005 18:38:48 -0000 1.2 @@ -30,7 +30,7 @@ all: $(OBJDEST) $(OBJS) $(OBJDEST)/retrieveSIE: retrieveSIE.c - $(CC) $(CFLAGS) $(MCC_INCLUDE) $< -o $@ $(NSPRLINK) $(LDAP_NOSSL_LINK) $(ICULINK) -L$(OBJDIR)/lib -ladminutil10 + $(CC) $(CFLAGS) $(MCC_INCLUDE) $< -o $@ $(NSPRLINK) $(LDAP_NOSSL_LINK) $(ICULINK) -L$(OBJDIR)/lib -ladminutil $(OBJDEST): -mkdir $(OBJDEST) From fedora-directory-commits at redhat.com Tue Dec 6 18:38:33 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 6 Dec 2005 13:38:33 -0500 Subject: [Fedora-directory-commits] adminutil/include version.h,1.3,1.4 Message-ID: <200512061839.jB6Id31L018948@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818/include Modified Files: version.h Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: version.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/version.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- version.h 16 Nov 2005 18:50:04 -0000 1.3 +++ version.h 6 Dec 2005 18:38:26 -0000 1.4 @@ -23,10 +23,12 @@ files libadminutil/dllVersionINfo.rc and libadmsslutil/dllVersionInfo.rc */ +#ifdef XP_WIN32 #include +#endif -#define ADMSDK_NAME "Administration Server Utility" -#ifdef _DEBUG +#define ADMSDK_NAME "Administration Utility" +#ifdef MCC_DEBUG #define ADMSDK_PRODUCT ADMSDK_NAME " (debug)" #define ADMSDK_FLAGS VS_FF_DEBUG #else @@ -41,3 +43,5 @@ #define VI_COMPANYNAME "Red Hat, Inc." #define VI_COPYRIGHT "Copyright (C) 2005 Red Hat, Inc." + +#define ADMSDK_BUILDNUM "2005.334.210" From fedora-directory-commits at redhat.com Tue Dec 6 18:38:38 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 6 Dec 2005 13:38:38 -0500 Subject: [Fedora-directory-commits] adminutil/include/libadminutil admutil.h, 1.2, 1.3 distadm.h, 1.2, 1.3 prodinfo.h, 1.1.1.1, 1.2 psetc.h, 1.1.1.1, 1.2 resource.h, 1.1.1.1, 1.2 srvutil.h, 1.2, 1.3 Message-ID: <200512061839.jB6Id9mn018956@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil/include/libadminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818/include/libadminutil Modified Files: admutil.h distadm.h prodinfo.h psetc.h resource.h srvutil.h Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: admutil.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/admutil.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- admutil.h 29 Sep 2005 22:10:10 -0000 1.2 +++ admutil.h 6 Dec 2005 18:38:31 -0000 1.3 @@ -17,6 +17,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ + +/* + * adminutil.h - prototypes for libadminutil + * + * $Id$ + */ + #ifndef __ADMUTIL_H__ #define __ADMUTIL_H__ Index: distadm.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/distadm.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- distadm.h 29 Sep 2005 22:10:10 -0000 1.2 +++ distadm.h 6 Dec 2005 18:38:31 -0000 1.3 @@ -17,6 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ +/* + * disadm.h + * + * $Id$ + */ #ifndef __DISTADM_H__ #define __DISTADM_H__ Index: prodinfo.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/prodinfo.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- prodinfo.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ prodinfo.h 6 Dec 2005 18:38:31 -0000 1.2 @@ -17,6 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ +/* + * prodinfo.h + * + * $Id$ + */ #ifndef prodinfo_h #define prodinfo_h Index: psetc.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/psetc.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- psetc.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ psetc.h 6 Dec 2005 18:38:31 -0000 1.2 @@ -17,6 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ +/* + * psetc.h + * + * $Id$ + */ #ifndef __PSETC_H__ #define __PSETC_H__ Index: resource.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/resource.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- resource.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ resource.h 6 Dec 2005 18:38:31 -0000 1.2 @@ -17,6 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ +/* + * resource.h + * + * $Id$ + */ #ifndef _RESOURCE_H_ #define _RESOURCE_H_ Index: srvutil.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/srvutil.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- srvutil.h 16 Nov 2005 18:50:09 -0000 1.2 +++ srvutil.h 6 Dec 2005 18:38:31 -0000 1.3 @@ -17,6 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ +/* + * srvutil.h + * + * $Id$ + */ #ifndef __SRVUTIL_H__ #define __SRVUTIL_H__ From fedora-directory-commits at redhat.com Tue Dec 6 18:38:39 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 6 Dec 2005 13:38:39 -0500 Subject: [Fedora-directory-commits] adminutil/include/libadmsslutil SECerrs.h, 1.1.1.1, 1.2 SSLerrs.h, 1.1.1.1, 1.2 admsslutil.h, 1.1.1.1, 1.2 certmgt.h, 1.1.1.1, 1.2 psetcssl.h, 1.1.1.1, 1.2 srvutilssl.h, 1.1.1.1, 1.2 sslpset.h, 1.1.1.1, 1.2 Message-ID: <200512061839.jB6Id912018964@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil/include/libadmsslutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818/include/libadmsslutil Modified Files: SECerrs.h SSLerrs.h admsslutil.h certmgt.h psetcssl.h srvutilssl.h sslpset.h Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: SECerrs.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/SECerrs.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- SECerrs.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ SECerrs.h 6 Dec 2005 18:38:36 -0000 1.2 @@ -17,9 +17,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ -/* General security error codes */ /* Caller must #include "secerr.h" */ - +/* + * SECerrs.h - General security error codes + * + * $Id$ + */ ER3(SEC_ERROR_IO, SEC_ERROR_BASE + 0, "An I/O error occurred during security authorization.") Index: SSLerrs.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/SSLerrs.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- SSLerrs.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ SSLerrs.h 6 Dec 2005 18:38:36 -0000 1.2 @@ -17,8 +17,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ -/* SSL-specific security error codes */ /* caller must include "sslerr.h" */ +/* + * SSLerrs.h - SSL-specific security error codes + * + * $Id$ + */ ER3(SSL_ERROR_EXPORT_ONLY_SERVER, SSL_ERROR_BASE + 0, "Unable to communicate securely. Peer does not support high-grade encryption.") Index: admsslutil.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/admsslutil.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- admsslutil.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ admsslutil.h 6 Dec 2005 18:38:36 -0000 1.2 @@ -17,6 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ +/* + * admsslutil.h + * + * $Id$ + */ #ifndef __ADMSSLUTIL_H__ #define __ADMSSLUTIL_H__ Index: certmgt.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/certmgt.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- certmgt.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ certmgt.h 6 Dec 2005 18:38:36 -0000 1.2 @@ -17,6 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ +/* + * certmgt.h + * + * $Id$ + */ #ifndef __certmgt_h #define __certmgt_h Index: psetcssl.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/psetcssl.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- psetcssl.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ psetcssl.h 6 Dec 2005 18:38:37 -0000 1.2 @@ -17,6 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ +/* + * psetcssl.h + * + * $Id$ + */ #ifndef __PSETCSSL_H__ #define __PSETCSSL_H__ Index: srvutilssl.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/srvutilssl.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- srvutilssl.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ srvutilssl.h 6 Dec 2005 18:38:37 -0000 1.2 @@ -17,6 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ +/* + * srvutilssl.h + * + * $Id$ + */ #ifndef __SRVUTILSSL_H__ #define __SRVUTILSSL_H__ Index: sslpset.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/sslpset.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- sslpset.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ sslpset.h 6 Dec 2005 18:38:37 -0000 1.2 @@ -34,6 +34,7 @@ * ------- * Wed Apr 7 00:45:16 1999 - Created * + * $Id$ */ #ifndef SSLPSET_H #define SSLPSET_H From fedora-directory-commits at redhat.com Tue Dec 6 18:38:44 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 6 Dec 2005 13:38:44 -0500 Subject: [Fedora-directory-commits] adminutil/lib/libadminutil Makefile, 1.3, 1.4 admutil.c, 1.1.1.1, 1.2 Message-ID: <200512061839.jB6IdF3i018969@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil/lib/libadminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818/lib/libadminutil Modified Files: Makefile admutil.c Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 9 Nov 2005 07:16:40 -0000 1.3 +++ Makefile 6 Dec 2005 18:38:37 -0000 1.4 @@ -28,35 +28,33 @@ include ../../nsdefs.mk -OBJDEST=$(OBJDIR)/lib/libadminutil +OBJLIBDIR=$(OBJDIR)/lib +OBJDEST=$(OBJLIBDIR)/libadminutil ifeq ($(ARCH), WINNT) ifeq ($(DEBUG), fulld) - LIBS=$(OBJDIR)/lib/libadminutild_s$(ADMSDK_SO_VERSION).lib - SO_NAME=$(OBJDIR)/lib/libadminutild$(ADMSDK_SO_VERSION) + LIBS=$(OBJLIBDIR)/libadminutild_s$(ADMSDK_SO_VERSION).lib + SO_NAME=libadminutild else - LIBS=$(OBJDIR)/lib/libadminutil_s$(ADMSDK_SO_VERSION).lib - SO_NAME=$(OBJDIR)/lib/libadminutil$(ADMSDK_SO_VERSION) + LIBS=$(OBJLIBDIR)/libadminutil_s$(ADMSDK_SO_VERSION).lib + SO_NAME=libadminutil endif else - LIBS=$(OBJDIR)/lib/libadminutil$(ADMSDK_SO_VERSION).a - SO_NAME=$(OBJDIR)/lib/libadminutil$(ADMSDK_SO_VERSION) -endif - -ifeq ($(ARCH), HPUX) - SO_LIB=$(SO_NAME)$(DLL_PRESUF).sl -else - SO_LIB=$(SO_NAME)$(DLL_PRESUF).$(DLL_SUFFIX) + LIBS=$(OBJLIBDIR)/libadminutil-$(ADMSDK_SO_DOTVERSION).a + SO_NAME=libadminutil endif include ../../nsconfig.mk +SO_COREEXT:=$(DLL_PRESUF).$(DLL_SUFFIX) +SO_EXT:=$(SO_COREEXT).$(ADMSDK_SO_DOTVERSION) +SO_LIB:=$(OBJLIBDIR)/$(SO_NAME)$(SO_EXT) + ifeq ($(ARCH), AIX) override EXTRA_LIBS := -L.:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib \ -bI:/usr/lib/lowsys.exp -L. -lC_r -lC -lpthreads -lc_r -lm \ /usr/lib/libc.a -ldl -lbsd -brtl -berok -ADM_EXPORT_FILE=$(SO_NAME)$(DLL_PRESUF).exp LDAPLINK=-L$(LDAP_LIBPATH) $(addprefix -l, $(LDAP_SOLIB_NAMES)) $(addprefix -l, $(LDAP_SSLLIB_NAMES)) endif @@ -76,26 +74,27 @@ errRpt.o form_post.o strlist.o \ resource.o uginfo.o $(OSOBJS)) -all: $(OBJDEST) $(LIBS) $(SO_LIB) resource_bundle +all: $(OBJDEST) $(SO_LIB) resource_bundle $(OBJDEST): - echo $(LIBS) echo $(SO_LIB) mkdir -p $(OBJDEST) -ifeq ($(ARCH), WINNT) -$(LIBS): $(OBJS) - rm -f $@ - $(AR) $(OBJS) - $(RANLIB) $@ -else -$(LIBS): $(OBJS) - rm -f $@ - $(AR) $(OBJS) - $(RANLIB) $@ +# stop building static libraries +#ifeq ($(ARCH), WINNT) +#$(LIBS): $(OBJS) +# rm -f $@ +# $(AR) $(OBJS) +# $(RANLIB) $@ +#else +#$(LIBS): $(OBJS) +# rm -f $@ +# $(AR) $(OBJS) +# $(RANLIB) $@ +#endif -endif ifeq ($(ARCH), AIX) +ADM_EXPORT_FILE=$(OBJLIBDIR)/$(SO_NAME)$(DLL_PRESUF).exp $(SO_LIB): $(OBJS) nm -B -C -g $(OBJS) \ | awk '/ [T,D,B] / {print $$3}' \ @@ -114,6 +113,8 @@ $(SO_LIB): $(OBJS) rm -f $@ $(LINK_DLL) $(OBJS) $(DEPLIBS) + cd $(OBJLIBDIR); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT) + cd $(OBJLIBDIR); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION) endif endif Index: admutil.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/admutil.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- admutil.c 20 Jul 2005 22:51:32 -0000 1.1.1.1 +++ admutil.c 6 Dec 2005 18:38:37 -0000 1.2 @@ -22,12 +22,27 @@ #include #include #include +#include "version.h" #include "admutil_pvt.h" #ifdef XP_WIN32 #define strcasecmp stricmp #define strncasecmp _strnicmp #endif + +#ifdef XP_UNIX +/* + * Version information for the 'ident' and 'what commands + * + * NOTE: the first component of the concatenated rcsid string + * must not end in a '$' to prevent rcs keyword substitution. + */ +static char rcsid[] = "$Header: AdminUtil " ADMSDK_PRODUCT + " " ADMSDK_BUILDNUM " $"; +static char sccsid[] = "@(#)AdminUtil " ADMSDK_PRODUCT + " " ADMSDK_BUILDNUM; +#endif /* XP_UNIX */ + /* Max size for a pathname */ #ifndef PATH_MAX From fedora-directory-commits at redhat.com Tue Dec 6 18:38:50 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 6 Dec 2005 13:38:50 -0500 Subject: [Fedora-directory-commits] adminutil/lib/libadmsslutil Makefile, 1.1.1.1, 1.2 admsslutil.c, 1.1.1.1, 1.2 Message-ID: <200512061839.jB6IdK0U018973@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil/lib/libadmsslutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818/lib/libadmsslutil Modified Files: Makefile admsslutil.c Log Message: [172166] Admin Util RPM 1) admin util library name has been updated from libadminutil10.so to libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1 2) dropped static library Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 20 Jul 2005 22:51:32 -0000 1.1.1.1 +++ Makefile 6 Dec 2005 18:38:42 -0000 1.2 @@ -28,35 +28,34 @@ include ../../nsdefs.mk -OBJDEST=$(OBJDIR)/lib/libadmsslutil +OBJLIBDIR=$(OBJDIR)/lib +OBJDEST=$(OBJLIBDIR)/libadmsslutil ifeq ($(ARCH), WINNT) ifeq ($(DEBUG), fulld) - LIBS=$(OBJDIR)/lib/libadmsslutild_s$(ADMSDK_SO_VERSION).lib - SO_NAME=$(OBJDIR)/lib/libadmsslutild$(ADMSDK_SO_VERSION) + LIBS=$(OBJLIBDIR)/libadmsslutild_s$(ADMSDK_SO_VERSION).lib + SO_NAME=libadmsslutild else - LIBS=$(OBJDIR)/lib/libadmsslutil_s$(ADMSDK_SO_VERSION).lib - SO_NAME=$(OBJDIR)/lib/libadmsslutil$(ADMSDK_SO_VERSION) + LIBS=$(OBJLIBDIR)/libadmsslutil_s$(ADMSDK_SO_VERSION).lib + SO_NAME=libadmsslutil endif else - LIBS=$(OBJDIR)/lib/libadmsslutil$(ADMSDK_SO_VERSION).a - SO_NAME=$(OBJDIR)/lib/libadmsslutil$(ADMSDK_SO_VERSION) -endif - -ifeq ($(ARCH), HPUX) - SO_LIB=$(SO_NAME)$(DLL_PRESUF).sl -else - SO_LIB=$(SO_NAME)$(DLL_PRESUF).$(DLL_SUFFIX) + LIBS=$(OBJLIBDIR)/libadmsslutil-$(ADMSDK_SO_DOTVERSION).a + SO_NAME=libadmsslutil endif include ../../nsconfig.mk +SO_COREEXT:=$(DLL_PRESUF).$(DLL_SUFFIX) +SO_EXT:=$(SO_COREEXT).$(ADMSDK_SO_DOTVERSION) +SO_LIB:=$(OBJLIBDIR)/$(SO_NAME)$(SO_EXT) + ifeq ($(ARCH), AIX) override EXTRA_LIBS := -L.:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib \ -bI:/usr/lib/lowsys.exp -L. -lC_r -lC -lpthreads -lc_r -lm \ /usr/lib/libc.a -ldl -lbsd -brtl -berok -ADM_EXPORT_FILE=$(SO_NAME)$(DLL_PRESUF).exp +ADM_EXPORT_FILE=$(OBJLIBDIR)/$(SO_NAME)$(DLL_PRESUF).exp endif DEPLIBS += $(ADMSDKLINK) $(ICULINK) $(LDAPLINK) $(SVRCORELINK) $(SECURITYLINK) $(NSPRLINK) @@ -70,18 +69,18 @@ OBJS=$(addprefix $(OBJDEST)/, certmgt.o secpwd.o sslerror.o admsslutil.o psetcssl.o \ srvutilssl.o uginfossl.o $(OSOBJS)) -all: $(OBJDEST) $(LIBS) $(SO_LIB) +all: $(OBJDEST) $(SO_LIB) $(OBJDEST): - echo $(LIBS) echo $(SO_LIB) mkdir -p $(OBJDEST) -$(LIBS): $(OBJS) - rm -f $@ - $(AR) $(OBJS) - $(RANLIB) $@ +# stop building static libraries +#$(LIBS): $(OBJS) +# rm -f $@ +# $(AR) $(OBJS) +# $(RANLIB) $@ ifeq ($(ARCH), AIX) $(SO_LIB): $(OBJS) @@ -102,6 +101,8 @@ $(SO_LIB): $(OBJS) rm -f $@ $(LINK_DLL) $(OBJS) $(DEPLIBS) + cd $(OBJLIBDIR); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT) + cd $(OBJLIBDIR); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION) endif endif Index: admsslutil.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/admsslutil.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- admsslutil.c 20 Jul 2005 22:51:33 -0000 1.1.1.1 +++ admsslutil.c 6 Dec 2005 18:38:42 -0000 1.2 @@ -37,6 +37,7 @@ #include "errno.h" #include "secport.h" #include "libadmsslutil/certmgt.h" +#include "version.h" #define ADMSSL_BUF_LEN 1024 @@ -50,6 +51,19 @@ #define SECURITY_ATTR "configuration.nsServerSecurity" +#ifdef XP_UNIX +/* + * Version information for the 'ident' and 'what commands + * + * NOTE: the first component of the concatenated rcsid string + * must not end in a '$' to prevent rcs keyword substitution. + */ +static char rcsid[] = "$Header: AdminUtil " ADMSDK_PRODUCT + " " ADMSDK_BUILDNUM " $"; +static char sccsid[] = "@(#)AdminUtil " ADMSDK_PRODUCT + " " ADMSDK_BUILDNUM; +#endif /* XP_UNIX */ + void servssl_error(char *fmt, ...); char custom_file[BIG_LINE] = ""; From fedora-directory-commits at redhat.com Wed Dec 7 02:05:22 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 6 Dec 2005 21:05:22 -0500 Subject: [Fedora-directory-commits] mod_admserv Makefile.am, 1.8, 1.9 Makefile.in, 1.11, 1.12 configure, 1.12, 1.13 configure.in, 1.10, 1.11 Message-ID: <200512070205.jB725MZA002503@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2481 Modified Files: Makefile.am Makefile.in configure configure.in Log Message: [172166] Admin Util RPM Pick up new Admin Util; libadminutil.so[.1.0] format Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/mod_admserv/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.am 28 Oct 2005 01:57:54 -0000 1.8 +++ Makefile.am 7 Dec 2005 02:04:52 -0000 1.9 @@ -6,7 +6,7 @@ ## Set the includes and libraries needed INCLUDES = -I at apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@ -LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 +LIBS = @adminutil_lib@ -ladminutil -ladmsslutil @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 install-libLTLIBRARIES: libmodadmserv.la @APXS@ -i -a -n admserv libmodadmserv.la Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile.in 28 Oct 2005 01:57:54 -0000 1.11 +++ Makefile.in 7 Dec 2005 02:04:52 -0000 1.12 @@ -104,7 +104,7 @@ libmodadmserv_la_SOURCES = mod_admserv.c INCLUDES = -I at apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@ -LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 +LIBS = @adminutil_lib@ -ladminutil -ladmsslutil @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ Index: configure =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- configure 28 Oct 2005 01:57:54 -0000 1.12 +++ configure 7 Dec 2005 02:04:54 -0000 1.13 @@ -8581,20 +8581,20 @@ if test "${with_adminutil+set}" = set; then withval="$with_adminutil" - if test -e "$withval"/include/libadminutil/admutil.h -a -d "$withval"/lib + if test -e "$withval"/include/*/libadminutil/admutil.h -a -d "$withval"/lib then echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 ADMINUTILDIR=$withval - adminutil_inc="-I$ADMINUTILDIR/include" adminutil_lib="-L$ADMINUTILDIR/lib" for file in $ADMINUTILDIR/lib/* ; do - echo $file | grep 'libadminutil0-90-9' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\(0-90-9\).*/\1/'` ; break + echo $file | grep 'libadminutil0-90-9' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\..*\.\(0-9*\.0-9*\).*/\1/'` ; break done if test -z "$adminutil_ver" then - adminutil_ver=10 + adminutil_ver=1.0 fi + adminutil_inc="-I$ADMINUTILDIR/include/adminutil-$adminutil_ver" else echo { { echo "$as_me:$LINENO: error: $withval not found" >&5 Index: configure.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- configure.in 28 Oct 2005 01:57:54 -0000 1.10 +++ configure.in 7 Dec 2005 02:04:54 -0000 1.11 @@ -219,19 +219,19 @@ AC_MSG_CHECKING(for --with-adminutil) AC_ARG_WITH(adminutil, [ --with-adminutil=PATH Adminutil directory], [ - if test -e "$withval"/include/libadminutil/admutil.h -a -d "$withval"/lib + if test -e "$withval"/include/*/libadminutil/admutil.h -a -d "$withval"/lib then AC_MSG_RESULT([using $withval]) ADMINUTILDIR=$withval - adminutil_inc="-I$ADMINUTILDIR/include" adminutil_lib="-L$ADMINUTILDIR/lib" for file in $ADMINUTILDIR/lib/* ; do - echo $file | grep 'libadminutil[0-9][0-9]' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\([0-9][0-9]\).*/\1/'` ; break + echo $file | grep 'libadminutil[0-9][0-9]' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\..*\.\([0-9]*\.[0-9]*\).*/\1/'` ; break done if test -z "$adminutil_ver" then - adminutil_ver=10 + adminutil_ver=1.0 fi + adminutil_inc="-I$ADMINUTILDIR/include/adminutil-$adminutil_ver" else echo AC_MSG_ERROR([$withval not found]) From fedora-directory-commits at redhat.com Wed Dec 7 04:19:08 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 6 Dec 2005 23:19:08 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff adminserver10to101.patch, NONE, 1.1 Message-ID: <200512070419.jB74J8Id006016@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5999 Added Files: adminserver10to101.patch Log Message: patch file to convert admin server version 1.0 files to version 1.0.1 adminserver10to101.patch: --- NEW FILE adminserver10to101.patch --- --- admin-serv/config/httpd.conf 3 Nov 2005 23:20:49 -0000 1.6 +++ admin-serv/config/httpd.conf 7 Dec 2005 04:11:38 -0000 @@ -243,19 +243,20 @@ # AllowOverride controls what directives may be placed in .htaccess files. # It can be "All", "None", or any combination of the keywords: # Options FileInfo AuthConfig Limit # AllowOverride None # # Controls who can get stuff from this server. -# - Order allow,deny - Allow from all +# By default, no one may access anything +# Access must be explicitly granted in admserv.conf + Order deny,allow + Deny from all # # DirectoryIndex: sets the file that Apache will serve if a directory # is requested. # # The index.html.var file (a type-map) is used to deliver content- --- admin-serv/config/admserv.conf 19 Nov 2005 00:43:02 -0000 1.11 +++ admin-serv/config/admserv.conf 6 Dec 2005 18:38:57 -0000 @@ -20,24 +20,63 @@ # # To get the Admin Express working properly, add the following to # apache, either directly or thru an Include /path/to/this.conf SetEnv NETSITE_ROOT /opt/fedora-ds SetEnv ADMSERV_ROOT /opt/fedora-ds/admin-serv/config/ ADMCacheLifeTime 600 -ADMServerVersionString "Fedora-Administrator/1.0" +ADMServerVersionString "Fedora-Administrator/1.0.1" ScriptAlias /clients/orgchart/bin/ "/opt/fedora-ds/clients/orgchart/bin/" ScriptAlias /clients/dsgw/bin/ "/opt/fedora-ds/clients/dsgw/bin/" ScriptAlias /bin/admin/admin/bin/ "/opt/fedora-ds/bin/admin/admin/bin/" ScriptAlias /dist/ "/opt/fedora-ds/dist/" ScriptAlias /manual/help/ /opt/fedora-ds/manual/help/ +# all access is explicitly denied by default in httpd.conf +# the following Directory directives turn on access for specific +# directories + + AllowOverride None + Options None + Order allow,deny + Allow from all + + + + AllowOverride None + Options None + Order allow,deny + Allow from all + + + + AllowOverride None + Options None + Order allow,deny + Allow from all + + + + AllowOverride None + Options None + Order allow,deny + Allow from all + + + + AllowOverride None + Options None + Order allow,deny + Allow from all + + +# enable access for CGI progs/scripts AllowOverride None Options None Order allow,deny Allow from all @@ -64,52 +103,62 @@ # Handle the initial login SetHandler user-auth AuthUserFile /opt/fedora-ds/admin-serv/config/admpw AuthType basic AuthName "Admin Server" Require valid-user + Order allow,deny + Allow from all # Handle Other Console tasks AuthUserFile /opt/fedora-ds/admin-serv/config/admpw AuthType basic AuthName "Admin Server" Require valid-user AdminSDK on Options +ExecCGI + Order allow,deny + Allow from all # Handle Admin Express AuthUserFile /opt/fedora-ds/admin-serv/config/admpw AuthType basic AuthName "Admin Server" Require valid-user AdminSDK on NESCompatEnv on Options +ExecCGI + Order allow,deny + Allow from all # Handle internal commands AuthUserFile /opt/fedora-ds/admin-serv/config/admpw AuthType basic AuthName "Admin Server" Require valid-user + Order allow,deny + Allow from all # Handle Stop, Start, Restart, Instance Creation - invoke mod_restartd # need to add instance creation because you may want to create an instance # of DS on a low port, and instance creation starts the instance as well AuthUserFile /home/rich/72srv/admin-serv/config/admpw AuthType basic AuthName "Admin Server" Require valid-user ## turn off the password pipe when using mod_restartd AdminSDK off Options +ExecCGI RetainPerms on + Order allow,deny + Allow from all From fedora-directory-commits at redhat.com Wed Dec 7 19:31:16 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 14:31:16 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff adminserver-start-admin.patch, NONE, 1.1 Message-ID: <200512071931.jB7JVGhu001371@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1354 Added Files: adminserver-start-admin.patch Log Message: patch to convert libldap- to libldap adminserver-start-admin.patch: --- NEW FILE adminserver-start-admin.patch --- --- start-admin 9 Sep 2005 19:12:03 -0000 1.4 +++ start-admin 7 Dec 2005 17:27:40 -0000 @@ -41,17 +41,17 @@ HTTPD=%%%httpd%%% # see if httpd is linked with the openldap libraries - we need to override them OS=`uname -s` if [ $OS = "Linux" ]; then hasol=0 - /usr/bin/ldd $HTTPD 2>&1 | grep libldap- > /dev/null 2>&1 && hasol=1 + /usr/bin/ldd $HTTPD 2>&1 | grep libldap > /dev/null 2>&1 && hasol=1 if [ $hasol -eq 1 ] ; then LD_PRELOAD="${SERVER_ROOT}/bin/admin/lib/libssl3.so ${SERVER_ROOT}/bin/admin/lib/libldap50.so" export LD_PRELOAD fi fi $HTTPD -k start -d $ADMSERV_ROOT -f $ADMSERV_ROOT/config/httpd.conf "$@" From fedora-directory-commits at redhat.com Wed Dec 7 20:46:13 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 15:46:13 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff admserv.conf, 1.11, 1.12 httpd.conf, 1.6, 1.7 Message-ID: <200512072046.jB7KkDrh003672@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3638/adminserver/admserv/cfgstuff Modified Files: admserv.conf httpd.conf Log Message: Bug(s) fixed: 174837 Bug Description: CVE-2005-3630 use of IFRAME exposes password from adm.conf for users Reviewed by: Nathan, Rob C. (Thanks!) Files: https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=121993 Branch: HEAD Fix Description: Just use the existing Apache security mechanisms to deny access to everything by default, then allow access to certain directories. In addition, there is a patch file I've checked in which can apply these diffs to an existing FDS 1.0 installtion. I've changed the packaging makefile to package the patch file into the setup directory where it will be used to patch an upgrade install of FDS 1.0.1 on top of FDS 1.0. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: admserv.conf =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- admserv.conf 19 Nov 2005 00:43:02 -0000 1.11 +++ admserv.conf 7 Dec 2005 20:46:06 -0000 1.12 @@ -25,7 +25,7 @@ SetEnv ADMSERV_ROOT %%%sroot%%%/admin-serv/config/ ADMCacheLifeTime 600 -ADMServerVersionString "Fedora-Administrator/1.0" +ADMServerVersionString "Fedora-Administrator/1.0.1" ScriptAlias /clients/orgchart/bin/ "%%%sroot%%%/clients/orgchart/bin/" ScriptAlias /clients/dsgw/bin/ "%%%sroot%%%/clients/dsgw/bin/" @@ -33,6 +33,45 @@ ScriptAlias /dist/ "%%%sroot%%%/dist/" ScriptAlias /manual/help/ %%%sroot%%%/manual/help/ +# all access is explicitly denied by default in httpd.conf +# the following Directory directives turn on access for specific +# directories + + AllowOverride None + Options None + Order allow,deny + Allow from all + + + + AllowOverride None + Options None + Order allow,deny + Allow from all + + + + AllowOverride None + Options None + Order allow,deny + Allow from all + + + + AllowOverride None + Options None + Order allow,deny + Allow from all + + + + AllowOverride None + Options None + Order allow,deny + Allow from all + + +# enable access for CGI progs/scripts AllowOverride None Options None @@ -69,6 +108,8 @@ AuthType basic AuthName "Admin Server" Require valid-user + Order allow,deny + Allow from all # Handle Other Console tasks @@ -79,6 +120,8 @@ Require valid-user AdminSDK on Options +ExecCGI + Order allow,deny + Allow from all # Handle Admin Express @@ -90,6 +133,8 @@ AdminSDK on NESCompatEnv on Options +ExecCGI + Order allow,deny + Allow from all # Handle internal commands @@ -98,6 +143,8 @@ AuthType basic AuthName "Admin Server" Require valid-user + Order allow,deny + Allow from all # Handle Stop, Start, Restart, Instance Creation - invoke mod_restartd @@ -112,4 +159,6 @@ AdminSDK off Options +ExecCGI RetainPerms on + Order allow,deny + Allow from all Index: httpd.conf =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- httpd.conf 3 Nov 2005 23:20:49 -0000 1.6 +++ httpd.conf 7 Dec 2005 20:46:06 -0000 1.7 @@ -248,9 +248,10 @@ # # Controls who can get stuff from this server. -# - Order allow,deny - Allow from all +# By default, no one may access anything +# Access must be explicitly granted in admserv.conf + Order deny,allow + Deny from all From fedora-directory-commits at redhat.com Wed Dec 7 21:25:58 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 16:25:58 -0500 Subject: [Fedora-directory-commits] ldapserver Makefile, 1.28, 1.29 internal_comp_deps.mk, 1.32, 1.33 nsdefs.mk, 1.15, 1.16 Message-ID: <200512072125.jB7LPwOv005400@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5380/ldapserver Modified Files: Makefile internal_comp_deps.mk nsdefs.mk Log Message: Bug(s) fixed: 175053 Bug Description: The BUILD_BOMB is on by default Reviewed by: Nathan (Thanks!) Fix Description: Move the pumpkin and build bomb stuff into the internal makefiles. If you want the build bomb on, you have to set BUILD_PUMPKIN=1 on the make command line. The diff also contains some of the versioning for 1.0 to 1.0.1. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- Makefile 10 Nov 2005 01:35:45 -0000 1.28 +++ Makefile 7 Dec 2005 21:25:50 -0000 1.29 @@ -161,10 +161,6 @@ consoleComponents: $(DS_CONSOLE_COMPONENT_DEP) -pumpkin: - @echo NSOS_RELEASE is: $(NSOS_RELEASE) - $(PERL) pumpkin.pl $(PUMPKIN_AGE) pumpkin.dat - buildnum: if test ! -d $(BUILD_ARCH); then mkdir $(BUILD_ARCH); fi; $(PERL) buildnum.pl -p $(BUILD_ARCH) @@ -218,7 +214,7 @@ buildAndPkgDirectory: buildDirectory pkgDirectory -buildDirectory: buildnum pumpkin $(OBJDIR) $(DIRVER_H) $(SDKVER_H) components +buildDirectory: buildnum $(PUMPKIN_TARGET) $(OBJDIR) $(DIRVER_H) $(SDKVER_H) components @echo @echo @echo ==== Starting LDAP Server ========== @@ -357,6 +353,7 @@ -e 's/@COMPANY-PRODUCT-NAME@/Fedora Directory Server/g' \ -e 's/@LCASE-COMPANY-NAME-NOSP@/fedora/g' \ -e 's/@GEN-VERSION@/1.0/g' \ + -e 's/@NOSP-VERSION@/1.0.1/g' \ -e 's+ at COMPANY-URL@+http://directory.fedora.redhat.com/+g' \ ldapserver.spec.tmpl > $@ mv $@ $(OBJDIR) Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- internal_comp_deps.mk 4 Nov 2005 02:45:20 -0000 1.32 +++ internal_comp_deps.mk 7 Dec 2005 21:25:50 -0000 1.33 @@ -45,6 +45,13 @@ BUILD_MODE = ext +ifdef BUILD_PUMPKIN +PUMPKIN_AGE := 120 +#BUILD_BOMB= +BUILD_BOMB=-DPUMPKIN_HOUR=$(shell cat $(BUILD_ROOT)/pumpkin.dat) +BOMB=$(BUILD_BOMB) +endif # BUILD_PUMPKIN + ifndef NSPR_SOURCE_ROOT NSPR_IMPORT = $(COMPONENTS_DIR)/nspr20/$(NSPR_RELDATE)/$(FULL_RTL_OBJDIR) NSPR_DEP = $(NSPR_LIBPATH)/libnspr4.$(LIB_SUFFIX) @@ -732,3 +739,11 @@ then echo "Error: could not get component NT4SYNC files $@" ; \ fi # Windows sync component for NT4 + +# BUILD_BOMB stuff +PUMPKIN_TARGET = pumpkin +$(PUMPKIN_TARGET): +ifdef BUILD_PUMPKIN + @echo NSOS_RELEASE is: $(NSOS_RELEASE) + $(PERL) pumpkin.pl $(PUMPKIN_AGE) pumpkin.dat +endif # BUILD_PUMPKIN Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- nsdefs.mk 29 Oct 2005 02:25:50 -0000 1.15 +++ nsdefs.mk 7 Dec 2005 21:25:50 -0000 1.16 @@ -59,9 +59,6 @@ USE_HCL=1 -PUMPKIN_AGE := 120 -#BUILD_BOMB= -BUILD_BOMB=-DPUMPKIN_HOUR=$(shell cat $(BUILD_ROOT)/pumpkin.dat) BUILD_CHECKER=no ifndef BUILD_DEBUG BUILD_DEBUG=full @@ -171,7 +168,6 @@ echo BUILD_SECURITY=$(BUILD_SECURITY) echo BUILD_DEBUG=$(BUILD_DEBUG) echo BUILD_NSPR_THREADS=$(BUILD_NSPR_THREADS) -echo BUILD_BOMB=$(BUILD_BOMB) echo BUILD_DLL_VERSION=$(BUILD_DLL_VERSION) echo BUILD_HTTPDLL_NAME=$(BUILD_HTTPDLL_NAME) echo BUILD_ADMIN_NAME=$(BUILD_ADMIN_NAME) @@ -189,7 +185,6 @@ endif SECURITY=$(BUILD_SECURITY) DEBUG=$(BUILD_DEBUG) -BOMB=$(BUILD_BOMB) NSPR_THREADS=$(BUILD_NSPR_THREADS) BUILD_DLL=$(BUILD_DLL_VERSION) ADMINDLL_NAME=$(BUILD_ADMIN_NAME) @@ -232,8 +227,8 @@ OBJDIR=$(COMMON_OBJDIR) OBJDIR_32=$(COMMON_OBJDIR_32) DO_SEARCH=no -DIR_VERSION:=1.0 -NOSP_DIR_VERSION:=1.0 +DIR_VERSION:=1.0.1 +NOSP_DIR_VERSION:=1.0.1 DIR_NORM_VERSION:=1.0 PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)" # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must From fedora-directory-commits at redhat.com Wed Dec 7 21:29:21 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 16:29:21 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst ns-update, 1.9, 1.10 Message-ID: <200512072129.jB7LTLj8005479@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5433/ldapserver/ldap/cm/newinst Modified Files: ns-update Log Message: Bug(s) fixed: 175098 Bug Description: The dsgw cookie directory needs to be writable by the admin server uid Reviewed by: Nathan (Thanks!) Fix Description: DS Gateway authentication breaks because the admin server uid cannot write to the bin/slapd/authck directory. This fix makes sure that directory is owned by the correct uid. I've also put a similar fix into the ds spec file %post section to fix this when upgrading from fds10 to fds101. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: ns-update =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ns-update,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ns-update 17 Nov 2005 17:34:35 -0000 1.9 +++ ns-update 7 Dec 2005 21:29:14 -0000 1.10 @@ -200,4 +200,13 @@ ./fix_secmod_db_64 $sroot/alias $sroot/shared32/bin fi +# chown the cookie directory - bug 175098 +if [ "$ssuser" ] ; then + if [ "$ssgrp" ] ; then + chown $ssuser:$ssgrp $sroot/bin/slapd/authck + else + chown $ssuser $sroot/bin/slapd/authck + fi +fi + exit $rc From fedora-directory-commits at redhat.com Wed Dec 7 21:29:10 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 16:29:10 -0500 Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.18, 1.19 Message-ID: <200512072129.jB7LTeVv005482@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5433/ldapserver Modified Files: ldapserver.spec.tmpl Log Message: Bug(s) fixed: 175098 Bug Description: The dsgw cookie directory needs to be writable by the admin server uid Reviewed by: Nathan (Thanks!) Fix Description: DS Gateway authentication breaks because the admin server uid cannot write to the bin/slapd/authck directory. This fix makes sure that directory is owned by the correct uid. I've also put a similar fix into the ds spec file %post section to fix this when upgrading from fds10 to fds101. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ldapserver.spec.tmpl 16 Nov 2005 17:40:35 -0000 1.18 +++ ldapserver.spec.tmpl 7 Dec 2005 21:29:03 -0000 1.19 @@ -44,8 +44,8 @@ %define __os_install_post %{nil} Summary: @COMPANY-PRODUCT-NAME@ Name: @LCASE-COMPANY-NAME-NOSP at -ds -Version: @GEN-VERSION@ -Release: 2. at PLATFORM@ +Version: @NOSP-VERSION@ +Release: 1. at PLATFORM@ License: GPL plus extensions Group: System Environment/Daemons URL: @COMPANY-URL@ @@ -78,6 +78,8 @@ # the echo yes is for dsktune to continue # the second echo yes is for some platforms that need it (echo yes ; echo yes) | ./setup -b $RPM_BUILD_ROOT/%{prefix} +# remove the setup log files so they aren't packaged +rm -f $RPM_BUILD_ROOT/%{prefix}/setup/*/*.log %clean if [ -z "$RPM_INSTALL_PREFIX" ]; then @@ -120,7 +122,37 @@ if [ -z "$RPM_INSTALL_PREFIX" ]; then RPM_INSTALL_PREFIX=%{prefix} fi -echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers." +if [ "$1" -ge 1 ] ; then +# patch file to upgrade admin server from 1.0 to 1.0.1 + if [ -f $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch ] ; then + patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch + fi +# patch file to fix start-admin on Fedora Core 2 + if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch ] ; then + patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch + fi +# fix up file permissions + testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf + if [ ! -f $testfile ] ; then + testfile=$RPM_INSTALL_PREFIX/admin-serv/config/adm.conf + fi + if [ -f $testfile ] ; then + usergroup=`ls -l $testfile | awk '{print $3":"$4}'` + if [ -d $RPM_INSTALL_PREFIX/admin-serv/config ] ; then + chown $usergroup $RPM_INSTALL_PREFIX/admin-serv/config + fi + if [ -d $RPM_INSTALL_PREFIX/bin/slapd/authck ] ; then + chown $usergroup $RPM_INSTALL_PREFIX/bin/slapd/authck + fi + if [ -d $RPM_INSTALL_PREFIX/alias ] ; then + chown $usergroup $RPM_INSTALL_PREFIX/alias + fi + fi + echo "Install finished. Please restart your directory servers first," + echo "then the admin server. Do not run setup." +else + echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers." +fi %preun # only run uninstall if this is the last version of the package @@ -133,6 +165,11 @@ fi %changelog +* Tue Dec 6 2005 Rich Megginson - 1.0.1-1 +- Use nosp version instead of gen version to get patch version numbers +- Patch the admin server in the post install section +- Remove the unnecessary log files after setup so they aren't packaged + * Wed Nov 09 2005 Nathan Kinder 7.1-2 - Changed cyrus-sasl dependency to >= 2.1.15 for RHEL3 compatibility From fedora-directory-commits at redhat.com Wed Dec 7 21:29:16 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 16:29:16 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.23, 1.24 Message-ID: <200512072129.jB7LTkYb005485@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5433/ldapserver/ldap/admin/src Modified Files: create_instance.c Log Message: Bug(s) fixed: 175098 Bug Description: The dsgw cookie directory needs to be writable by the admin server uid Reviewed by: Nathan (Thanks!) Fix Description: DS Gateway authentication breaks because the admin server uid cannot write to the bin/slapd/authck directory. This fix makes sure that directory is owned by the correct uid. I've also put a similar fix into the ds spec file %post section to fix this when upgrading from fds10 to fds101. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: create_instance.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- create_instance.c 21 Oct 2005 19:21:10 -0000 1.23 +++ create_instance.c 7 Dec 2005 21:29:08 -0000 1.24 @@ -1921,6 +1921,7 @@ PR_snprintf(subdir, sizeof(subdir), "%s%cbin%cslapd%cauthck", sroot, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP); if( (t = create_instance_mkdir_p(subdir, NEWDIR_MODE)) ) return(t); + chownfile (pw, subdir); return (t); } From fedora-directory-commits at redhat.com Wed Dec 7 21:42:48 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 16:42:48 -0500 Subject: [Fedora-directory-commits] adminserver/include/nt regparms.h, 1.7, 1.8 Message-ID: <200512072142.jB7Lgmtb005594@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/include/nt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5560/adminserver/include/nt Modified Files: regparms.h Log Message: Bump version from 1.0 to 1.0.1 Index: regparms.h =================================================================== RCS file: /cvs/dirsec/adminserver/include/nt/regparms.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- regparms.h 28 Oct 2005 22:45:01 -0000 1.7 +++ regparms.h 7 Dec 2005 21:42:40 -0000 1.8 @@ -46,19 +46,19 @@ /* Admin IDs */ #define ADM_ID_PRODUCT "admin" #define ADM_NAME_SHORT "Administration" -#define ADM_VERSION "1.0" -#define ADM_NAME_VERSION "Administration 1.0" +#define ADM_VERSION "1.0.1" +#define ADM_NAME_VERSION "Administration 1.0.1" #define ADM_NAME_SERVER "Administration Server" #define ADM_NAME_FULL "Fedora Administration Server" -#define ADM_NAME_FULL_VERSION "Fedora Administration Server 1.0" -#define ADM_NAME_SERVICE "Fedora Administration 1.0" +#define ADM_NAME_FULL_VERSION "Fedora Administration Server 1.0.1" +#define ADM_NAME_SERVICE "Fedora Administration 1.0.1" #define ADM_EXE "ns-admin.exe" #define ADM_EXE_START "admin.exe" #define ADM_ID_SERVICE "admin10" -#define ADM_KEY_ROOT "Administration\\1.0" +#define ADM_KEY_ROOT "Administration\\1.0.1" #define ADM_SERVER_LST_NAME "adm:Netscape Enterprise Server" #define ADM_DIR_ROOT "admin" -#define ADM_NAME_UNINSTALL "Uninstall Administration Server 1.0" +#define ADM_NAME_UNINSTALL "Uninstall Administration Server 1.0.1" /* original definitions */ // Upper-level registry parameters From fedora-directory-commits at redhat.com Wed Dec 7 21:42:43 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 16:42:43 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/console/src/com/netscape/management/admserv admserv.properties, 1.4, 1.5 Message-ID: <200512072143.jB7LhDvu005597@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5560/adminserver/admserv/console/src/com/netscape/management/admserv Modified Files: admserv.properties Log Message: Bump version from 1.0 to 1.0.1 Index: admserv.properties =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/admserv.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- admserv.properties 28 Oct 2005 22:43:51 -0000 1.4 +++ admserv.properties 7 Dec 2005 21:42:35 -0000 1.5 @@ -22,7 +22,7 @@ # Admin Server Component Localization file admin-title=Administration Server -admin-version=Version 1.0 +admin-version=Version 1.0.1 admin-smallIcon=com/netscape/management/admserv/images/AdminServer.gif admin-largeIcon=com/netscape/management/admserv/images/AdminServerL.gif From fedora-directory-commits at redhat.com Wed Dec 7 21:50:16 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 16:50:16 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins testbind.c, 1.6, 1.7 testdatainterop.c, 1.6, 1.7 testentry.c, 1.6, 1.7 testextendedop.c, 1.6, 1.7 testgetip.c, 1.6, 1.7 testpostop.c, 1.6, 1.7 testpreop.c, 1.7, 1.8 testsaslbind.c, 1.8, 1.9 Message-ID: <200512072150.jB7LoGSL005705@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5620/ldapserver/ldap/servers/slapd/test-plugins Modified Files: testbind.c testdatainterop.c testentry.c testextendedop.c testgetip.c testpostop.c testpreop.c testsaslbind.c Log Message: Bump version from 1.0 to 1.0.1 Index: testbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testbind.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- testbind.c 29 Oct 2005 02:28:18 -0000 1.6 +++ testbind.c 7 Dec 2005 21:50:09 -0000 1.7 @@ -69,7 +69,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0", +Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0.1", "sample bind pre-operation plugin" }; static Slapi_ComponentId *plugin_id = NULL; Index: testdatainterop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdatainterop.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- testdatainterop.c 29 Oct 2005 02:28:18 -0000 1.6 +++ testdatainterop.c 7 Dec 2005 21:50:09 -0000 1.7 @@ -113,7 +113,7 @@ /* * Static variables. */ -static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0", +static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0.1", "sample pre-operation null suffix plugin" }; static Slapi_ComponentId *plugin_id = NULL; Index: testentry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testentry.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- testentry.c 29 Oct 2005 02:28:18 -0000 1.6 +++ testentry.c 7 Dec 2005 21:50:09 -0000 1.7 @@ -90,7 +90,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0", +Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0.1", "sample entry modification plugin" }; /* Entry store plug-in function */ Index: testextendedop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testextendedop.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- testextendedop.c 29 Oct 2005 02:28:18 -0000 1.6 +++ testextendedop.c 7 Dec 2005 21:50:09 -0000 1.7 @@ -83,7 +83,7 @@ /* OID of the extended operation handled by this plug-in */ #define MY_OID "1.2.3.4" -Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "1.0", +Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "1.0.1", "sample extended operation plugin" }; Index: testgetip.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testgetip.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- testgetip.c 29 Oct 2005 02:28:18 -0000 1.6 +++ testgetip.c 7 Dec 2005 21:50:09 -0000 1.7 @@ -74,7 +74,7 @@ #include "slapi-plugin.h" #include "nspr.h" -Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0", +Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0.1", "sample pre-operation plugin" }; static char *netaddr2str( PRNetAddr *addrp, char *buf, size_t buflen ); Index: testpostop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpostop.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- testpostop.c 29 Oct 2005 02:28:18 -0000 1.6 +++ testpostop.c 7 Dec 2005 21:50:09 -0000 1.7 @@ -93,7 +93,7 @@ static char *changelogfile = "/tmp/changelog"; #endif -Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0", +Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0.1", "sample post-operation plugin" }; static void write_changelog( int optype, char *dn, void *change, int flag ); Index: testpreop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpreop.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- testpreop.c 29 Oct 2005 02:28:18 -0000 1.7 +++ testpreop.c 7 Dec 2005 21:50:09 -0000 1.8 @@ -79,7 +79,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0", +Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0.1", "sample pre-operation plugin" }; /* Pre-operation plug-in function */ Index: testsaslbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testsaslbind.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- testsaslbind.c 29 Oct 2005 02:28:18 -0000 1.8 +++ testsaslbind.c 7 Dec 2005 21:50:09 -0000 1.9 @@ -80,7 +80,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0", +Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0.1", "sample SASL bind pre-operation plugin" }; From fedora-directory-commits at redhat.com Wed Dec 7 21:49:54 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 16:49:54 -0500 Subject: [Fedora-directory-commits] ldapserver/include version.h,1.7,1.8 Message-ID: <200512072150.jB7LoPjG005709@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5620/ldapserver/include Modified Files: version.h Log Message: Bump version from 1.0 to 1.0.1 Index: version.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/version.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- version.h 29 Oct 2005 02:25:55 -0000 1.7 +++ version.h 7 Dec 2005 21:49:47 -0000 1.8 @@ -44,9 +44,9 @@ exist, the PRODUCT_VERSION define has _DEF appended. */ -#define DIRECTORY_VERSION_DEF "1.0" +#define DIRECTORY_VERSION_DEF "1.0.1" #define DIRECTORY_COMPATIBLE "3.0" -#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0" +#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0.1" #define DS_VERSION_DEF DIRECTORY_VERSION_DEF #define DS_VERSION_STRING DIRECTORY_VERSION_STRING From fedora-directory-commits at redhat.com Wed Dec 7 21:50:00 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 16:50:00 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.45,1.46 Message-ID: <200512072150.jB7LoUUI005712@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5620/ldapserver/ldap/cm Modified Files: Makefile Log Message: Bump version from 1.0 to 1.0.1 Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Makefile 19 Nov 2005 00:50:32 -0000 1.45 +++ Makefile 7 Dec 2005 21:49:52 -0000 1.46 @@ -108,9 +108,9 @@ endif ifdef USE_64 -VERSION=-ver 1.0-64bit +VERSION=-ver 1.0.1-64bit else -VERSION=-ver 1.0 +VERSION=-ver 1.0.1 endif ifeq ($(ARCH), HPUX) @@ -266,7 +266,7 @@ ifdef BUILD_RPM # name and version of RPM - must correspond to the spec file - these get branded RPM_BASE_NAME=fedora - RPM_VERSION=1.0 + RPM_VERSION=1.0.1 RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION) RPM_ARCH = $(shell uname -i) # root dir for RPM built and temp files From fedora-directory-commits at redhat.com Wed Dec 7 21:50:05 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 16:50:05 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst slapd.inf, 1.7, 1.8 Message-ID: <200512072150.jB7LoZBw005715@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5620/ldapserver/ldap/cm/newinst Modified Files: slapd.inf Log Message: Bump version from 1.0 to 1.0.1 Index: slapd.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/slapd.inf,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- slapd.inf 21 Oct 2005 19:21:18 -0000 1.7 +++ slapd.inf 7 Dec 2005 21:49:58 -0000 1.8 @@ -46,13 +46,13 @@ InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%% NickName= slapd Version= %%%SERVER_VERSION%%% -Compatible= 4.0 +Compatible= 1.0 BuildNumber= %%%SERVER_BUILD_NUM%%% Expires= %%%PUMPKIN_HOUR%%% Security= %%%SECURITY%%% Vendor= Fedora Project Description= %%%SERVER_NAME%%% -Dependencies= base/4.5, svrcore/4.5 +Dependencies= base/1.0, svrcore/1.0 ProductName=Directory Server IsDirLite=%%%IS_DIR_LITE%%% SourcePath=slapd @@ -70,7 +70,7 @@ Name= Fedora Directory Server Console NickName= slapd-client Version= %%%SERVER_VERSION%%% -Compatible= 4.0 +Compatible= 1.0 Checked=True Mandatory=False IsLdap=False From fedora-directory-commits at redhat.com Wed Dec 7 21:50:11 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 16:50:11 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinstnt dsinst.rc, 1.8, 1.9 Message-ID: <200512072150.jB7LoffX005718@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm/newinstnt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5620/ldapserver/ldap/cm/newinstnt Modified Files: dsinst.rc Log Message: Bump version from 1.0 to 1.0.1 Index: dsinst.rc =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/dsinst.rc,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dsinst.rc 29 Oct 2005 02:26:22 -0000 1.8 +++ dsinst.rc 7 Dec 2005 21:50:03 -0000 1.9 @@ -89,7 +89,7 @@ VALUE "LegalCopyright", "Copyright 2001 Sun Microsystems, Inc. Portions copyright 1999, 2002 Netscape Communications Corporation. All rights reserved.\0" VALUE "OriginalFilename", "\0" VALUE "ProductName", "Fedora Server Products\0" - VALUE "ProductVersion", "1, 0, 0, 0\0" + VALUE "ProductVersion", "1, 0, 1, 0\0" END END BLOCK "VarFileInfo" From fedora-directory-commits at redhat.com Wed Dec 7 22:11:26 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 17:11:26 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src ux-update.cc, 1.16, 1.17 Message-ID: <200512072211.jB7MBQZN007387@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7367/adminserver/admserv/newinst/src Modified Files: ux-update.cc Log Message: do not overwrite the dynamic console.conf file when upgrading Index: ux-update.cc =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ux-update.cc 18 Nov 2005 21:15:51 -0000 1.16 +++ ux-update.cc 7 Dec 2005 22:11:07 -0000 1.17 @@ -1208,11 +1208,16 @@ logUninstallInfo(sroot, "admin", "admin", tstr); snprintf(tstr, sizeof(tstr), "%s/admin-serv/config/console.conf", sroot); - snprintf(src, sizeof(tstr), "%s/shared/config/template/console.conf.tmpl", sroot); - replaceTokensInFile(src, tstr, consolearray); - chmod(tstr, S_IRUSR | S_IWUSR); - chown_file(SSuser, SSgroup, tstr); - logUninstallInfo(sroot, "admin", "admin", tstr); + /* + all of the dynamic information goes into console.conf, so we should + not overwrite that information during an upgrade */ + if (stat(tstr, &st)) { + snprintf(src, sizeof(tstr), "%s/shared/config/template/console.conf.tmpl", sroot); + replaceTokensInFile(src, tstr, consolearray); + chmod(tstr, S_IRUSR | S_IWUSR); + chown_file(SSuser, SSgroup, tstr); + logUninstallInfo(sroot, "admin", "admin", tstr); + } snprintf(tstr, sizeof(tstr), "%s/start-admin", sroot); snprintf(src, sizeof(tstr), "%s/shared/config/template/start-admin.tmpl", sroot); From fedora-directory-commits at redhat.com Wed Dec 7 22:13:40 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 17:13:40 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff start-admin, 1.4, 1.5 Message-ID: <200512072213.jB7MDeE3007469@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7428/adminserver/admserv/cfgstuff Modified Files: start-admin Log Message: Bug(s) fixed: 175187 Bug Description: Apache linked with libldap.so not libldap-2.2.so on Fedora Core 2 Reviewed by: Nathan (Thanks!) Fix Description: grep for "libldap" not "libldap-". On Fedora Core 2, Apache is linked with libldap.so, not the libldap-2.2.so as on later OS versions. So, just changing it to look for libldap on all platforms should work just fine. I've also changed the spec file to apply the patch when upgrading from fds10 to fds101. Platforms tested: Fedora Core 4 (I don't have an FC 2 system to test this on, but the bug reported applied the same patch and it worked for him) Flag Day: no Doc impact: no Index: start-admin =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-admin,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- start-admin 9 Sep 2005 19:12:03 -0000 1.4 +++ start-admin 7 Dec 2005 22:13:32 -0000 1.5 @@ -46,7 +46,7 @@ if [ $OS = "Linux" ]; then hasol=0 - /usr/bin/ldd $HTTPD 2>&1 | grep libldap- > /dev/null 2>&1 && hasol=1 + /usr/bin/ldd $HTTPD 2>&1 | grep libldap > /dev/null 2>&1 && hasol=1 if [ $hasol -eq 1 ] ; then LD_PRELOAD="${SERVER_ROOT}/bin/admin/lib/libssl3.so ${SERVER_ROOT}/bin/admin/lib/libldap50.so" From fedora-directory-commits at redhat.com Wed Dec 7 22:45:24 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 17:45:24 -0500 Subject: [Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.32, 1.33 Message-ID: <200512072245.jB7MjOau007807@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7763/adminserver/admserv Modified Files: pkgadmin.mk Log Message: Change packaging so that either the old style adminutil properties or the new style can be used. Package the patch files in the setup directory. Index: pkgadmin.mk =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- pkgadmin.mk 23 Nov 2005 01:25:51 -0000 1.32 +++ pkgadmin.mk 7 Dec 2005 22:45:16 -0000 1.33 @@ -254,8 +254,13 @@ # Copy LIB ADMIN UTIL cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib - -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/adminutil-properties - cp -p $(ADMINUTIL_LIBPATH)/adminutil-properties/* $(ADMIN_DIR)/bin/admin/lib/adminutil-properties + - at if [ -d $(ADMINUTIL_LIBPATH)/property ] ; then \ + -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/property ; \ + cp -p $(ADMINUTIL_LIBPATH)/property/* $(ADMIN_DIR)/bin/admin/lib/property ; \ + elif [ -d $(ADMINUTIL_LIBPATH)/adminutil-properties ] ; then \ + -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/adminutil-properties ; \ + cp -p $(ADMINUTIL_LIBPATH)/adminutil-properties/* $(ADMIN_DIR)/bin/admin/lib/adminutil-properties ; \ + fi cd $(ADMSERV_OBJDIR)/cmdln; \ cp -p admconfig $(ADMIN_DIR)/bin/admin; @@ -274,6 +279,13 @@ cp -p $(BUILD_ROOT)/admserv/cfgstuff/stop-admin $(ADMIN_DIR)/shared/config/template/stop-admin.tmpl cp -p $(BUILD_ROOT)/admserv/cfgstuff/restart-admin $(ADMIN_DIR)/shared/config/template/restart-admin.tmpl +# The patch file that upgrades 1.0 to 1.0.1 + cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver10to101.patch $(ADMIN_DIR)/setup +# The patch file that fixes the start-admin ldap problem on Fedora Core 2 + cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver-start-admin.patch $(ADMIN_DIR)/setup +# The patch file that fixes the console ld libpath problem + cp -p $(BUILD_ROOT)/admserv/cfgstuff/console-ld-libpath.patch $(ADMIN_DIR)/setup + cp -p $(BUILD_ROOT)/admserv/newinst/common/config/not_installed.html $(ADMIN_DIR)/clients cd $(ADMSERV_OBJDIR)/cgi ; \ From fedora-directory-commits at redhat.com Wed Dec 7 23:53:00 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 18:53:00 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff console-ld-libpath.patch, NONE, 1.1 Message-ID: <200512072353.jB7Nr0lX010907@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10890 Added Files: console-ld-libpath.patch Log Message: make sure /opt/fedora-ds/shared/lib is used for shared libs used by the console console-ld-libpath.patch: --- NEW FILE console-ld-libpath.patch --- --- startconsole 26 Oct 2005 23:16:14 -0000 1.4 +++ startconsole 7 Dec 2005 23:50:54 -0000 @@ -26,17 +26,17 @@ then echo "$0: Your JAVA_HOME environment variable is not set. Please set it appropriately." exit 1 fi # # Make sure java exists and is executable # -if [ ! -f java -a ! -x java ] +if [ ! -f $JAVA_HOME/java -a ! -x $JAVA_HOME/java ] then echo "$0: The java program is not in your path, or is not executable." exit 1 fi # # See if libjava and libjvm exist, and set the lib path. These are linked to by JSS. # @@ -53,16 +53,19 @@ LD_LIBRARY_PATH="$LIBJAVA_DIR" SHLIB_PATH="$LIBJAVA_DIR" DYLD_PATH="$LIBJAVA_DIR" else LD_LIBRARY_PATH="$LIBJAVA_DIR:$LIBJVM_DIR" SHLIB_PATH="$LIBJAVA_DIR:$LIBJVM_DIR" DYLD_PATH="$LIBJAVA_DIR:$LIBJVM_DIR" fi + LD_LIBRARY_PATH=/opt/fedora-ds/shared/lib:${LD_LIBRARY_PATH} + SHLIB_PATH=/opt/fedora-ds/shared/lib:${SHLIB_PATH} + DYLD_PATH=/opt/fedora-ds/shared/lib:${DYLD_PATH} export LD_LIBRARY_PATH export SHLIB_PATH export DYLD_PATH fi # # Launch the Console # From fedora-directory-commits at redhat.com Thu Dec 8 00:59:22 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 7 Dec 2005 19:59:22 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd dn.c, 1.6, 1.7 Message-ID: <200512080059.jB80xMfX012810@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12762 Modified Files: dn.c Log Message: [175063] entry with escaped characters fails to import and index It used to be taken to the "convert to quoted value" section even though the rdn did not have a quote. Index: dn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/dn.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dn.c 19 Apr 2005 22:07:36 -0000 1.6 +++ dn.c 8 Dec 2005 00:59:14 -0000 1.7 @@ -188,8 +188,7 @@ case INVALUE: if ( gotesc ) { if ( SEPARATOR( *s ) ) { - if ( value_separator ) value_separator = dn; - else value_separator = d; + value_separator = d; } else if ( ! NEEDSESCAPE( *s ) ) { --d; /* eliminate the \ */ } From fedora-directory-commits at redhat.com Thu Dec 8 01:14:25 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 20:14:25 -0500 Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.19, 1.20 Message-ID: <200512080114.jB81EPvj014416@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14400 Modified Files: ldapserver.spec.tmpl Log Message: add the console-ld-libpath.patch for bug 174981 Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ldapserver.spec.tmpl 7 Dec 2005 21:29:03 -0000 1.19 +++ ldapserver.spec.tmpl 8 Dec 2005 01:14:17 -0000 1.20 @@ -131,6 +131,10 @@ if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch ] ; then patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch fi +# patch file to fix startconsole ld libpath + if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then + patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch + fi # fix up file permissions testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf if [ ! -f $testfile ] ; then From fedora-directory-commits at redhat.com Thu Dec 8 02:37:32 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 21:37:32 -0500 Subject: [Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.33, 1.34 Message-ID: <200512080237.jB82bWHd016558@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16542 Modified Files: pkgadmin.mk Log Message: whoops - I left the - at the beginning of the mkdir command Index: pkgadmin.mk =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- pkgadmin.mk 7 Dec 2005 22:45:16 -0000 1.33 +++ pkgadmin.mk 8 Dec 2005 02:37:25 -0000 1.34 @@ -254,11 +254,11 @@ # Copy LIB ADMIN UTIL cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib - - at if [ -d $(ADMINUTIL_LIBPATH)/property ] ; then \ - -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/property ; \ + if [ -d $(ADMINUTIL_LIBPATH)/property ] ; then \ + $(MKDIR) $(ADMIN_DIR)/bin/admin/lib/property ; \ cp -p $(ADMINUTIL_LIBPATH)/property/* $(ADMIN_DIR)/bin/admin/lib/property ; \ elif [ -d $(ADMINUTIL_LIBPATH)/adminutil-properties ] ; then \ - -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/adminutil-properties ; \ + $(MKDIR) $(ADMIN_DIR)/bin/admin/lib/adminutil-properties ; \ cp -p $(ADMINUTIL_LIBPATH)/adminutil-properties/* $(ADMIN_DIR)/bin/admin/lib/adminutil-properties ; \ fi From fedora-directory-commits at redhat.com Thu Dec 8 02:37:59 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 21:37:59 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff console-ld-libpath.patch, 1.1, 1.2 Message-ID: <200512080237.jB82bxle016583@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16564 Modified Files: console-ld-libpath.patch Log Message: look for the java command in java_home/bin console-ld-libpath.patch: Index: console-ld-libpath.patch =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/console-ld-libpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- console-ld-libpath.patch 7 Dec 2005 23:52:53 -0000 1.1 +++ console-ld-libpath.patch 8 Dec 2005 02:37:52 -0000 1.2 @@ -10,7 +10,7 @@ # Make sure java exists and is executable # -if [ ! -f java -a ! -x java ] -+if [ ! -f $JAVA_HOME/java -a ! -x $JAVA_HOME/java ] ++if [ ! -f $JAVA_HOME/bin/java -a ! -x $JAVA_HOME/bin/java ] then echo "$0: The java program is not in your path, or is not executable." exit 1 From fedora-directory-commits at redhat.com Thu Dec 8 03:59:09 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 22:59:09 -0500 Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.20, 1.21 Message-ID: <200512080359.jB83x9IF018540@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18524 Modified Files: ldapserver.spec.tmpl Log Message: need to patch the console in both upgrade installation and regular installation Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ldapserver.spec.tmpl 8 Dec 2005 01:14:17 -0000 1.20 +++ ldapserver.spec.tmpl 8 Dec 2005 03:59:02 -0000 1.21 @@ -122,6 +122,10 @@ if [ -z "$RPM_INSTALL_PREFIX" ]; then RPM_INSTALL_PREFIX=%{prefix} fi +# patch file to fix startconsole ld libpath +if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then + patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch +fi if [ "$1" -ge 1 ] ; then # patch file to upgrade admin server from 1.0 to 1.0.1 if [ -f $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch ] ; then @@ -131,10 +135,6 @@ if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch ] ; then patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch fi -# patch file to fix startconsole ld libpath - if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then - patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch - fi # fix up file permissions testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf if [ ! -f $testfile ] ; then From fedora-directory-commits at redhat.com Thu Dec 8 04:14:34 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Dec 2005 23:14:34 -0500 Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.21, 1.22 Message-ID: <200512080414.jB84EYYA020277@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20261 Modified Files: ldapserver.spec.tmpl Log Message: the install is an upgrade if the %post argument is greater than 1, not greater than or equal to 1 Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ldapserver.spec.tmpl 8 Dec 2005 03:59:02 -0000 1.21 +++ ldapserver.spec.tmpl 8 Dec 2005 04:14:27 -0000 1.22 @@ -126,7 +126,7 @@ if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch fi -if [ "$1" -ge 1 ] ; then +if [ "$1" -gt 1 ] ; then # patch file to upgrade admin server from 1.0 to 1.0.1 if [ -f $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch ] ; then patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch From fedora-directory-commits at redhat.com Thu Dec 8 20:18:47 2005 From: fedora-directory-commits at redhat.com (Elliot Lee (sopwith)) Date: Thu, 8 Dec 2005 15:18:47 -0500 Subject: [Fedora-directory-commits] CVSROOT loginfo, 1.8, 1.9 syncmail, 1.1, 1.2 Message-ID: <200512082018.jB8KIlJW020516@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/dirsec/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20496 Modified Files: loginfo syncmail Log Message: do *docs* Index: loginfo =================================================================== RCS file: /cvs/dirsec/CVSROOT/loginfo,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- loginfo 20 Oct 2005 18:48:52 -0000 1.8 +++ loginfo 8 Dec 2005 20:18:40 -0000 1.9 @@ -27,3 +27,4 @@ #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} cvsdirsec at fedora.redhat.com ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/dirsec localdelivery at cvs-int.fedora.redhat.com +ALL $CVSROOT/CVSROOT/syncmail --require-keyword='*docs*' %{sVv} relnotes at fedoraproject.org Index: syncmail =================================================================== RCS file: /cvs/dirsec/CVSROOT/syncmail,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- syncmail 15 Apr 2005 15:43:19 -0000 1.1 +++ syncmail 8 Dec 2005 20:18:40 -0000 1.2 @@ -2,9 +2,10 @@ # -*- Python -*- # # PLEASE DO NOT EDIT THIS FILE IN PLACE IN THE CVS TREE!!! -# check out the CVSROOT/admin directory on your local machine, +# check out the CVSROOT directory on your local machine, # make the changes there and commit. Otherwise your changes # will be lost. --gafton +# - updated by sopwith to add a --require-keyword option that only sends mail if 'keyword' is found in the comment message # # - updated by gafton to allow for --nodiff option. The nodiff option # still sends out messages when something changes in a directory, but @@ -62,6 +63,9 @@ Use as the environment variable CVSROOT. Otherwise this variable must exist in the environment. + --require-keyword=STRING + Only send mail if STRING is found in the commit message. + --nodiff Don't bother generating the full diff, just report if the files changed or not. @@ -183,7 +187,7 @@ return string.join(lines, '') # send mail using sendmail -def blast_mail(subject, people): +def blast_mail(subject, people): global optDiffStat # the redirection sequence in this command is actually intentional @@ -198,7 +202,11 @@ del diff_files[-3:] if diff_files[-3:] == ['-', 'Imported', 'sources']: del diff_files[-3:] - + commit_message = sys.stdin.read() + for I in optRequireKeyword: + if I not in commit_message: + return + # cannot wait for child process or that will cause parent to retain cvs # lock for too long. Urg! if not os.fork(): # in the child @@ -206,20 +214,21 @@ time.sleep(2) fp = os.popen(sendmail, 'w') fp.write("Content-Type: TEXT/PLAIN; charset=US-ASCII\n") - fp.write("Subject: %s\n" % subject) - fp.write("To: %s\n" % people) + fp.write("Subject: %s\n" % (subject,)) + fp.write("To: %s\n" % (people,)) if os.environ.has_key("CVSROOT"): fp.write("X-CVSROOT: %s\n" % (os.environ["CVSROOT"],)) username = pwd.getpwuid(os.getuid())[0] - fp.write("X-CVS-Module: %s\n" % cvs_module) - fp.write("X-CVS-Directory: %s\n" % cvs_dir) - fp.write("X-CVS-Server: %s\n" % (os.uname()[1],)) + hostname = os.uname()[1] + fp.write("X-CVS-Module: %s\n" % (cvs_module,)) + fp.write("X-CVS-Directory: %s\n" % (cvs_dir,)) fp.write("X-CVS-User: %s\n" % (username,)) + fp.write("X-CVS-Server: %s\n" % (hostname,)) fp.write("Precedence: first-class\n") fp.write("\n") fp.write("Author: %s\n\n" % (username,)) # now insert the CVS blurb - fp.write(sys.stdin.read()) + fp.write(commit_message) fp.write('\n') # append the diffs if available and sensible graphics = re.compile(r".*\.(jp(e)?g|gif|png|tif(f)?),", re.IGNORECASE) @@ -245,14 +254,16 @@ global DIFF_HEAD_LINES global DIFF_TAIL_LINES global DIFF_TRUNCATE_IF_LARGER + global optRequireKeyword try: opts, args = getopt.getopt(sys.argv[1:], 'h', [ 'cvsroot=', 'quiet', 'nodiff', 'nodiffstat', 'help', - 'headlines=', 'taillines=', 'truncate=']) + 'headlines=', 'taillines=', 'truncate=', 'require-keyword=']) except getopt.error, msg: usage(1, msg) + optRequireKeyword = [] # parse the options for opt, arg in opts: if opt in ('-h', '--help'): @@ -268,12 +279,14 @@ optDiffStat = 0 elif opt == '--nodiffstat': optDiffStat = 0 - elif opt == 'headlines=': + elif opt == '--headlines': DIFF_HEAD_LINES = arg - elif opt == 'taillines=': + elif opt == '--taillines': DIFF_TAIL_LINES = arg - elif opt == 'truncate=': + elif opt == '--truncate': DIFF_TRUNCATE_IF_LARGER = arg + elif opt == '--require-keyword': + optRequireKeyword.append(arg) # What follows is the specification containing the files that were # modified. The argument actually must be split, with the first component From fedora-directory-commits at redhat.com Thu Dec 8 21:34:00 2005 From: fedora-directory-commits at redhat.com (Elliot Lee (sopwith)) Date: Thu, 8 Dec 2005 16:34:00 -0500 Subject: [Fedora-directory-commits] CVSROOT syncmail,1.2,1.3 Message-ID: <200512082134.jB8LY0sn022434@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/dirsec/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22415/CVSROOT-dirsec Modified Files: syncmail Log Message: fix syncmail Index: syncmail =================================================================== RCS file: /cvs/dirsec/CVSROOT/syncmail,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- syncmail 8 Dec 2005 20:18:40 -0000 1.2 +++ syncmail 8 Dec 2005 21:33:52 -0000 1.3 @@ -204,7 +204,7 @@ del diff_files[-3:] commit_message = sys.stdin.read() for I in optRequireKeyword: - if I not in commit_message: + if commit_message.find(I) < 0: return # cannot wait for child process or that will cause parent to retain cvs From fedora-directory-commits at redhat.com Mon Dec 12 18:34:22 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 12 Dec 2005 13:34:22 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src ux-update.cc, 1.17, 1.18 Message-ID: <200512121834.jBCIYMQG007102@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5217 Modified Files: ux-update.cc Log Message: [175418] Admin Server ns-update crashes if necessary attribute-value is not given check if the attribute-value is set or not; if not, issue an error and quit. Index: ux-update.cc =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ux-update.cc 7 Dec 2005 22:11:07 -0000 1.17 +++ ux-update.cc 12 Dec 2005 18:34:14 -0000 1.18 @@ -77,7 +77,7 @@ InstallMode installMode = Interactive; InstallInfo *installInfo = NULL; -InstallInfo *adminInfo = NULL; +InstallInfo *adminInstallInfo = NULL; InstallInfo *dsInfo = NULL; char *infoFile = NULL; char *logFile = NULL; @@ -100,7 +100,7 @@ } else { - printf("ERROR: Administration Server configuration failed. See install.log.\n"); + printf("ERROR: Administration Server configuration failed.\n"); installLog->logMessage(FATAL, "Admin", format, arg1, arg2); } exit(1); @@ -537,18 +537,31 @@ char *ss; chdir(sroot); + + if (NULL == adminInstallInfo) { + fatal_error("Admin Info is not set or invalid.", "", ""); + } // Get admin port from installInfo - s = adminInfo->get("Port"); + s = adminInstallInfo->get("Port"); + if (NULL == s) { + fatal_error("InstallInfo: Admin Port \"Port\" is missing.", "", ""); + } port = atoi(s); - s = adminInfo->get("SysUser"); + s = adminInstallInfo->get("SysUser"); + if (NULL == s) { + fatal_error("InstallInfo: Admin System User \"SysUser\" is missing.", "", ""); + } strcpy(adminUser, s); - s = adminInfo->get("ApacheDir"); + s = adminInstallInfo->get("ApacheDir"); + if (NULL == s) { + fatal_error("InstallInfo: Apache Directory \"ApacheDir\" is missing.", "", ""); + } strcpy(apacheDir, s); - s = adminInfo->get("ApacheRoot"); + s = adminInstallInfo->get("ApacheRoot"); if (!s) { NSString ar = findApacheRoot(apacheDir); strcpy(apacheRoot, (const char *)ar); @@ -565,13 +578,18 @@ } s = installInfo->get(SS_USER_ID); - + if (NULL == s) { + fatal_error("InstallInfo: Server User \"SuiteSpotUserID\" is missing.", "", ""); + } strcpy(SSuser, s); s = installInfo->get(SS_GROUP); + if (NULL == s) { + fatal_error("InstallInfo: Server Group \"SuiteSpotGroup\" is missing.", "", ""); + } strcpy(SSgroup,s); - s = adminInfo->get("ServerIpAddress"); + s = adminInstallInfo->get("ServerIpAddress"); if (s == NULL || s[0] == ' ') strcpy(serverAddress, "\0"); else @@ -580,6 +598,9 @@ char *p; p = strdup(installInfo->get(CONFIG_LDAP_URL)); + if (NULL == p) { + fatal_error("Failed to duplicate %s.", installInfo->get(CONFIG_LDAP_URL), ""); + } char *cp; @@ -591,7 +612,7 @@ free(p); } - s = adminInfo->get("ServerAdminID"); + s = adminInstallInfo->get("ServerAdminID"); if (s) { strcpy(httpuser, s); @@ -603,7 +624,7 @@ #endif strcpy(httpuser, DEFAULT_ADMINUSER); } - s = adminInfo->get("ServerAdminPwd"); + s = adminInstallInfo->get("ServerAdminPwd"); if (s) { @@ -619,7 +640,7 @@ #ifdef ORIGINAL_HOST_IP_QUERIES // PVO - s = adminInfo->get("HostIpAddress"); + s = installInfo->get("HostIpAddress"); strcpy(hosts,s); #else strcpy(hosts, "*"); @@ -1476,9 +1497,9 @@ { switch (opt) { - case 'r': - reConfig = True; - break; + case 'r': + reConfig = True; + break; case 's': installMode = Silent; break; @@ -1505,9 +1526,10 @@ if (infoFile == NULL || installInfo == NULL || installInfo->isEmpty() == True || - (adminInfo = installInfo->getSection("admin")) == NULL) + (adminInstallInfo = installInfo->getSection("admin")) == NULL) { - printf("ERROR: Answer cache not found or invalid\n"); + installLog->logMessage(FATAL, "Admin", "Answer cache (admin section) not found or invalid."); + printf("ERROR: Answer cache (admin section) not found or invalid.\n"); exit(1); } @@ -1515,14 +1537,14 @@ { if (infoFile == NULL || (stat(infoFile, &fi) == -1)) { - installLog->logMessage(FATAL, "Admin", "Installation script not found"); - printf("ERROR:Installation script not found.\n"); - exit(1); + installLog->logMessage(FATAL, "Admin", "Installation script not found"); + printf("ERROR:Installation script not found.\n"); + exit(1); } else { - // PVO - why ??? - installInfo = new InstallInfo (infoFile); + // PVO - why ??? + installInfo = new InstallInfo (infoFile); } } @@ -1559,11 +1581,19 @@ } sroot = installInfo->get(SERVER_ROOT); + if (NULL == sroot) { + fatal_error("InstallInfo: Server Root \"ServerRoot\" is missing.", "", ""); + } /* * Get the full hostname. */ - strcpy(hn,installInfo->get(MACHINE_NAME)); + const char *machine_name; + machine_name = installInfo->get(MACHINE_NAME); + if (NULL == machine_name) { + fatal_error("InstallInfo: Hostname \"FullMachineName\" is missing.", "", ""); + } + strcpy(hn, machine_name); cleanup_after_upgrade(sroot); From fedora-directory-commits at redhat.com Tue Dec 13 20:58:30 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 13 Dec 2005 15:58:30 -0500 Subject: [Fedora-directory-commits] setuputil/installer/unix installer.cc, 1.2, 1.3 product.cc, 1.1.1.1, 1.2 product.h, 1.1.1.1, 1.2 Message-ID: <200512132058.jBDKwUCF031736@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/setuputil/installer/unix In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31687 Modified Files: installer.cc product.cc product.h Log Message: [175418] Admin Server ns-update crashes if necessary attribute-value is not given 1) Although Admin Server's PostInstall program ns-update expects it, PostInstall framework in SetupUtil does not take silent install option "-s". Changed to pass the option. 2) PostInstall framework does not support logging. Changed to pass the option. 3) PostInstall failure is issued as WARNING and the installation finishes with Success message even though it really failed. Increased the error level to FATAL. Index: installer.cc =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/installer.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- installer.cc 26 Oct 2005 16:38:16 -0000 1.2 +++ installer.cc 13 Dec 2005 20:58:22 -0000 1.3 @@ -27,6 +27,14 @@ ** ** HISTORY: ** $Log$ +** Revision 1.3 2005/12/13 20:58:22 nhosoi +** [175418] Admin Server ns-update crashes if necessary attribute-value is not given +** 1) Although Admin Server's PostInstall program ns-update expects it, PostInstall +** framework in SetupUtil does not take silent install option "-s". Changed to pass the option. +** 2) PostInstall framework does not support logging. Changed to pass the option. +** 3) PostInstall failure is issued as WARNING and the installation finishes with +** Success message even though it really failed. Increased the error level to FATAL. +** ** Revision 1.2 2005/10/26 16:38:16 rmeggins ** Bug(s) fixed: 171793 ** Bug Description: Change setuputil version to 1.0 @@ -1566,7 +1574,8 @@ } else { - err = product.postInstall(_serverRoot,_sourceDir, _infoFile, _installInfo); + err = product.postInstall(_serverRoot, _sourceDir, + _infoFile, _installInfo, _installMode, _logFile); } _dialogManager->disableWinMode(); @@ -1578,7 +1587,8 @@ product.skip(True); if (_installMode == Silent) { - setupLogMessage(WARN, "Setup", "Failure installing %s\n.", product.get(PKG_NAME)); + setupLogMessage(FATAL, "Setup", "Failure installing %s\n.", product.get(PKG_NAME)); + return err; } else { @@ -1599,6 +1609,8 @@ if (p->isSelected() && !p->skipped()) { err = doPreOrPostInstall(*p, which); + if (err) + return err; } } Index: product.cc =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/product.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- product.cc 29 Jul 2005 22:16:32 -0000 1.1.1.1 +++ product.cc 13 Dec 2005 20:58:22 -0000 1.2 @@ -27,6 +27,14 @@ ** ** HISTORY: ** $Log$ +** Revision 1.2 2005/12/13 20:58:22 nhosoi +** [175418] Admin Server ns-update crashes if necessary attribute-value is not given +** 1) Although Admin Server's PostInstall program ns-update expects it, PostInstall +** framework in SetupUtil does not take silent install option "-s". Changed to pass the option. +** 2) PostInstall framework does not support logging. Changed to pass the option. +** 3) PostInstall failure is issued as WARNING and the installation finishes with +** Success message even though it really failed. Increased the error level to FATAL. +** ** Revision 1.1.1.1 2005/07/29 22:16:32 foxworth ** Importing new setup sdk for open source project ** @@ -1308,7 +1316,7 @@ } int -Product::postInstall(const NSString & serverRoot, const NSString & sourceDir, const char *infoFile, const InstallInfo *installInfo) const +Product::postInstall(const NSString & serverRoot, const NSString & sourceDir, const char *infoFile, const InstallInfo *installInfo, InstallMode installMode, const char *logFile) const { NSString program; NSString source; @@ -1336,6 +1344,11 @@ program = program + " -r"; } + if (installMode == Silent) + { + program = program + " -s -l " + logFile; + } + err = InstUtil::execProgram(program, source); } Index: product.h =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/product.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- product.h 29 Jul 2005 22:16:32 -0000 1.1.1.1 +++ product.h 13 Dec 2005 20:58:22 -0000 1.2 @@ -28,6 +28,14 @@ ** HISTORY ** ** $Log$ +** Revision 1.2 2005/12/13 20:58:22 nhosoi +** [175418] Admin Server ns-update crashes if necessary attribute-value is not given +** 1) Although Admin Server's PostInstall program ns-update expects it, PostInstall +** framework in SetupUtil does not take silent install option "-s". Changed to pass the option. +** 2) PostInstall framework does not support logging. Changed to pass the option. +** 3) PostInstall failure is issued as WARNING and the installation finishes with +** Success message even though it really failed. Increased the error level to FATAL. +** ** Revision 1.1.1.1 2005/07/29 22:16:32 foxworth ** Importing new setup sdk for open source project ** @@ -309,11 +317,13 @@ NSString install(const NSString & serverRoot, const NSString & source, NVPair *installInfo); int preInstall(const NSString & serverRoot, const NSString &sourceDir, - const char *installType, - InstallMode installMode, const char *logFile, - const char *cache) const; - - int postInstall(const NSString & serverRoot, const NSString & sourceDir, const char *infoFile, const InstallInfo *nvpair) const; + const char *installType, + InstallMode installMode, const char *logFile, + const char *cache) const; + + int postInstall(const NSString & serverRoot, const NSString & sourceDir, + const char *infoFile, const InstallInfo *nvpair, + InstallMode installMode, const char *logFile) const; NSString extract(const char *dest, const char *archive, const char *extractProgram=NULL, From fedora-directory-commits at redhat.com Thu Dec 15 21:08:15 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 15 Dec 2005 16:08:15 -0500 Subject: [Fedora-directory-commits] adminutil/lib/libadminutil Makefile, 1.4, 1.5 psetc.c, 1.1.1.1, 1.2 Message-ID: <200512152108.jBFL8FCx011087@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil/lib/libadminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11019/lib/libadminutil Modified Files: Makefile psetc.c Log Message: [172166] Admin Util build (64-bit) 1) nsarch does not run well since the output of 'ld --help' did not match the given regular expression. 2) added "_64" to the NSCONFIG macro to pick up the mozilla components. 3) added version number to the ident string 4) replaced 'perl ' with '/usr/bin/env perl ' 5) cleaned up warning message from gcc Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 6 Dec 2005 18:38:37 -0000 1.4 +++ Makefile 15 Dec 2005 21:07:44 -0000 1.5 @@ -77,7 +77,6 @@ all: $(OBJDEST) $(SO_LIB) resource_bundle $(OBJDEST): - echo $(SO_LIB) mkdir -p $(OBJDEST) # stop building static libraries Index: psetc.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/psetc.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- psetc.c 20 Jul 2005 22:51:32 -0000 1.1.1.1 +++ psetc.c 15 Dec 2005 21:07:44 -0000 1.2 @@ -28,6 +28,7 @@ #include #include #include "psetc_pvt.h" +#include "libadminutil/admutil.h" #include "dbtadmutil.h" #include From fedora-directory-commits at redhat.com Thu Dec 15 21:07:45 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 15 Dec 2005 16:07:45 -0500 Subject: [Fedora-directory-commits] adminutil/include/libadminutil admutil.h, 1.3, 1.4 Message-ID: <200512152108.jBFL8GvG011088@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil/include/libadminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11019/include/libadminutil Modified Files: admutil.h Log Message: [172166] Admin Util build (64-bit) 1) nsarch does not run well since the output of 'ld --help' did not match the given regular expression. 2) added "_64" to the NSCONFIG macro to pick up the mozilla components. 3) added version number to the ident string 4) replaced 'perl ' with '/usr/bin/env perl ' 5) cleaned up warning message from gcc Index: admutil.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/admutil.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- admutil.h 6 Dec 2005 18:38:31 -0000 1.3 +++ admutil.h 15 Dec 2005 21:07:17 -0000 1.4 @@ -32,6 +32,7 @@ #include "prtypes.h" #include "plstr.h" #include "prprf.h" +#include "prmem.h" /* Copy from #include "base/systems.h" */ #if defined (XP_WIN32) /* Windows NT */ From fedora-directory-commits at redhat.com Thu Dec 15 21:06:50 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 15 Dec 2005 16:06:50 -0500 Subject: [Fedora-directory-commits] adminutil nsarch, 1.1.1.1, 1.2 nsconfig.mk, 1.4, 1.5 nsdefs.mk, 1.4, 1.5 nsperl.mk, 1.2, 1.3 pumpkin.pl, 1.1.1.1, 1.2 Message-ID: <200512152108.jBFL8fwL011098@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11019 Modified Files: nsarch nsconfig.mk nsdefs.mk nsperl.mk pumpkin.pl Log Message: [172166] Admin Util build (64-bit) 1) nsarch does not run well since the output of 'ld --help' did not match the given regular expression. 2) added "_64" to the NSCONFIG macro to pick up the mozilla components. 3) added version number to the ident string 4) replaced 'perl ' with '/usr/bin/env perl ' 5) cleaned up warning message from gcc Index: nsarch =================================================================== RCS file: /cvs/dirsec/adminutil/nsarch,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- nsarch 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ nsarch 15 Dec 2005 21:06:22 -0000 1.2 @@ -570,7 +570,7 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. ld_help_string=`ld --help 2>&1` - if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then + if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .* elf_i[345]86"; then #echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 GNU_NAME="${UNAME_MACHINE}-unknown-linux" NS_NAME="${UNAME_SYSTEM}" Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsconfig.mk 6 Dec 2005 18:38:20 -0000 1.4 +++ nsconfig.mk 15 Dec 2005 21:06:22 -0000 1.5 @@ -59,6 +59,10 @@ ifeq (86,$(findstring 86,$(NSOS_TEST1))) NSOS_TEST1 = x86 endif + ifeq ($(USE_64), 1) + NSOS_TEST2 := $(NSOS_TEST1)$(NS64TAG) + NSOS_TEST1 := $(NSOS_TEST2) + endif NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION) NSCONFIG_NOTAG = $(NSCONFIG) else Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/adminutil/nsdefs.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsdefs.mk 16 Nov 2005 18:49:58 -0000 1.4 +++ nsdefs.mk 15 Dec 2005 21:06:22 -0000 1.5 @@ -188,13 +188,7 @@ UNZIP = $(ZIPDIR)/unzip.exe -o else - ifeq ($(BUILD_ARCH), Linux) -#PERL=$(COMPONENTS_DIR)/perl5/$(PKG_ARCH)2.1-perl5/perl - PERL=perl - else - NSPERL_RELDATE :=20020626 - PERL=/share/builds/sbstools/nsPerl/$(NSPERL_RELDATE)/$(NSOBJDIR_NAME_32)/nsperl - endif + PERL:=/usr/bin/env perl ZIP = $(COMPONENTS_DIR)/infozip/$(PKG_ARCH)/zip UNZIP = $(COMPONENTS_DIR)/infozip/$(PKG_ARCH)/unzip -o IZIP = $(ZIP) -ry9uT Index: nsperl.mk =================================================================== RCS file: /cvs/dirsec/adminutil/nsperl.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nsperl.mk 8 Nov 2005 18:21:47 -0000 1.2 +++ nsperl.mk 15 Dec 2005 21:06:22 -0000 1.3 @@ -62,7 +62,7 @@ endif ifeq ($(OSVER),SunOS5.9) SUNOS_ARCH = $(shell uname -m) - PERL5=/usr/bin/perl + PERL5:=/usr/bin/env perl endif ifeq ($(OSVER),SunOS5.5.1) PERL5=/tools/ns-arch/soft/perl-5.004_04/run/default/sparc_sun_solaris2.3/bin/perl5 @@ -76,6 +76,9 @@ ifeq ($(OSVER), HP-UXB.11.11) PERL5=/u/robobld/nsperl/hpux/nsperl endif +ifeq ($(OSVER), HP-UXB.11.23) +PERL5=/usr/bin/env perl +endif ifeq ($(BUILD_ARCH), Linux) -PERL5=perl +PERL5:=/usr/bin/env perl endif Index: pumpkin.pl =================================================================== RCS file: /cvs/dirsec/adminutil/pumpkin.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- pumpkin.pl 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ pumpkin.pl 15 Dec 2005 21:06:22 -0000 1.2 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # BEGIN COPYRIGHT BLOCK # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. From fedora-directory-commits at redhat.com Thu Dec 15 21:07:19 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 15 Dec 2005 16:07:19 -0500 Subject: [Fedora-directory-commits] adminutil/include version.h,1.4,1.5 Message-ID: <200512152108.jBFL8fVP011093@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11019/include Modified Files: version.h Log Message: [172166] Admin Util build (64-bit) 1) nsarch does not run well since the output of 'ld --help' did not match the given regular expression. 2) added "_64" to the NSCONFIG macro to pick up the mozilla components. 3) added version number to the ident string 4) replaced 'perl ' with '/usr/bin/env perl ' 5) cleaned up warning message from gcc Index: version.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/version.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- version.h 6 Dec 2005 18:38:26 -0000 1.4 +++ version.h 15 Dec 2005 21:06:48 -0000 1.5 @@ -28,20 +28,20 @@ #endif #define ADMSDK_NAME "Administration Utility" +#define ADMSDK_VMAJOR 1 +#define ADMSDK_VMINOR 0 +#define ADMSDK_VERSION "1.0" +#define ADMSDK_SO_VERSION "10" + #ifdef MCC_DEBUG -#define ADMSDK_PRODUCT ADMSDK_NAME " (debug)" +#define ADMSDK_PRODUCT ADMSDK_VERSION ": " ADMSDK_NAME " (debug)" #define ADMSDK_FLAGS VS_FF_DEBUG #else -#define ADMSDK_PRODUCT ADMSDK_NAME +#define ADMSDK_PRODUCT ADMSDK_VERSION ": " ADMSDK_NAME #define ADMSDK_FLAGS 0x0L #endif -#define ADMSDK_VMAJOR 1 -#define ADMSDK_VMINOR 0 -#define ADMSDK_VERSION "1.0" -#define ADMSDK_SO_VERSION "10" - #define VI_COMPANYNAME "Red Hat, Inc." #define VI_COPYRIGHT "Copyright (C) 2005 Red Hat, Inc." -#define ADMSDK_BUILDNUM "2005.334.210" +#define ADMSDK_BUILDNUM "2005.349.2055" From fedora-directory-commits at redhat.com Fri Dec 16 01:08:34 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 15 Dec 2005 20:08:34 -0500 Subject: [Fedora-directory-commits] setuputil nsarch, 1.1.1.1, 1.2 nsconfig.mk, 1.2, 1.3 Message-ID: <200512160108.jBG18YMo020169@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20150 Modified Files: nsarch nsconfig.mk Log Message: [Bug 175900] SetupUtil build (64-bit) 1) nsarch supports 64-bit ld output. (copied from adminutil) 2) modified CPU_ARCH value to pick up the right mozilla components. Index: nsarch =================================================================== RCS file: /cvs/dirsec/setuputil/nsarch,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- nsarch 29 Jul 2005 22:16:18 -0000 1.1.1.1 +++ nsarch 16 Dec 2005 01:07:51 -0000 1.2 @@ -1,20 +1,19 @@ #! /bin/sh # # BEGIN COPYRIGHT BLOCK -# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. -# +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation version # 2.1 of the License. -# +# # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. -# +# # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -178,7 +177,7 @@ #-------------------------------------------------------------------------- # everything that follows is GNU's config.guess slightly modified -# for internal use +# for our use # NT doesn't have /dev/null #UNAME_MACHINE=`(uname -m) 2> /dev/null` || UNAME_MACHINE=unknown @@ -571,7 +570,7 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. ld_help_string=`ld --help 2>&1` - if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then + if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .* elf_i[345]86"; then #echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 GNU_NAME="${UNAME_MACHINE}-unknown-linux" NS_NAME="${UNAME_SYSTEM}" Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nsconfig.mk 9 Nov 2005 01:56:12 -0000 1.2 +++ nsconfig.mk 16 Dec 2005 01:07:52 -0000 1.3 @@ -31,7 +31,11 @@ NSOS_TEST1 := $(shell uname -m) ifeq (86, $(findstring 86, $(NSOS_TEST1))) - CPU_ARCH := x86 + ifeq (x86, $(findstring x86, $(NSOS_TEST1))) + CPU_ARCH := $(NSOS_TEST1) + else + CPU_ARCH := x86 + endif else CPU_ARCH := $(NSOS_TEST1) endif @@ -44,9 +48,13 @@ ifeq ($(NSOS_ARCH),Linux) ifeq (86,$(findstring 86,$(NSOS_TEST1))) - NSOS_TMP := x86 + ifeq (x86, $(findstring x86, $(NSOS_TEST1))) + NSOS_TMP := $(NSOS_TEST1) + else + NSOS_TMP := x86 + endif else - NSOS_TMP := $(NSOS_TEST1) + NSOS_TMP := $(NSOS_TEST1) endif ifeq ($(USE_LIBC),1) LIBC_VERSION = _libc @@ -56,12 +64,16 @@ PTHREAD_TAG = _PTH NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)$(LIBC_VERSION)$(PTHREAD_TAG) NSCONFIG_NOTAG = $(NSCONFIG) - NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ else ifeq ($(NSOS_ARCH),RHEL) NSOS_TMP = $(NSOS_TEST1) ifeq (86,$(findstring 86,$(NSOS_TMP))) - NSOS_TMP = x86 + ifeq (x86, $(findstring x86, $(NSOS_TEST1))) + NSOS_TMP := $(NSOS_TEST1) + else + NSOS_TMP := x86 + endif endif PTHREAD_TAG = NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)_$(GCC_VERSION) From fedora-directory-commits at redhat.com Fri Dec 16 17:40:11 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 16 Dec 2005 12:40:11 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm filterindex.c, 1.4, 1.5 Message-ID: <200512161740.jBGHeBfr019794@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19777 Modified Files: filterindex.c Log Message: [175897] filter'd search not returning matches after index added Index: filterindex.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/filterindex.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- filterindex.c 19 Apr 2005 22:07:38 -0000 1.4 +++ filterindex.c 16 Dec 2005 17:40:03 -0000 1.5 @@ -640,7 +640,8 @@ { is_bounded_range = 0; } - if (NULL == fpairs[0] || NULL == fpairs[1]) + if (NULL == fpairs[0] || NULL == fpairs[1] || + 0 != strcmp(tpairs[0], tpairs[1]) /* avoid "&(cn<=A)(sn>=B)" type */ ) { fpairs[0] = fpairs[1] = NULL; slapi_ch_free_string(&tpairs[0]); From fedora-directory-commits at redhat.com Fri Dec 16 18:14:34 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 16 Dec 2005 13:14:34 -0500 Subject: [Fedora-directory-commits] setuputil nsarch,1.2,1.3 Message-ID: <200512161814.jBGIEYH3021657@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640 Modified Files: nsarch Log Message: Fixed parsing of supported emulations in nsarch Index: nsarch =================================================================== RCS file: /cvs/dirsec/setuputil/nsarch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nsarch 16 Dec 2005 01:07:51 -0000 1.2 +++ nsarch 16 Dec 2005 18:14:26 -0000 1.3 @@ -570,7 +570,7 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. ld_help_string=`ld --help 2>&1` - if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .* elf_i[345]86"; then + if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .*elf_i[345]86"; then #echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 GNU_NAME="${UNAME_MACHINE}-unknown-linux" NS_NAME="${UNAME_SYSTEM}" From fedora-directory-commits at redhat.com Fri Dec 16 18:16:07 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 16 Dec 2005 13:16:07 -0500 Subject: [Fedora-directory-commits] adminutil nsarch,1.2,1.3 Message-ID: <200512161816.jBGIG7Hx021707@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21690 Modified Files: nsarch Log Message: Fixed parsing of supported emulations in nsarch Index: nsarch =================================================================== RCS file: /cvs/dirsec/adminutil/nsarch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nsarch 15 Dec 2005 21:06:22 -0000 1.2 +++ nsarch 16 Dec 2005 18:15:59 -0000 1.3 @@ -570,7 +570,7 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. ld_help_string=`ld --help 2>&1` - if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .* elf_i[345]86"; then + if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .*elf_i[345]86"; then #echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 GNU_NAME="${UNAME_MACHINE}-unknown-linux" NS_NAME="${UNAME_SYSTEM}" From fedora-directory-commits at redhat.com Mon Dec 19 21:37:15 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 19 Dec 2005 16:37:15 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm filterindex.c, 1.4, 1.4.2.1 Message-ID: <200512192137.jBJLbFKe010456@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10398 Modified Files: Tag: Directory71RtmBranch filterindex.c Log Message: [175897] filter'd search not returning matches after index added Index: filterindex.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/filterindex.c,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- filterindex.c 19 Apr 2005 22:07:38 -0000 1.4 +++ filterindex.c 19 Dec 2005 21:37:07 -0000 1.4.2.1 @@ -640,7 +640,8 @@ { is_bounded_range = 0; } - if (NULL == fpairs[0] || NULL == fpairs[1]) + if (NULL == fpairs[0] || NULL == fpairs[1] || + 0 != strcmp(tpairs[0], tpairs[1]) /* avoid "&(cn<=A)(sn>=B)" type */ ) { fpairs[0] = fpairs[1] = NULL; slapi_ch_free_string(&tpairs[0]); From fedora-directory-commits at redhat.com Tue Dec 20 00:08:39 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 19 Dec 2005 19:08:39 -0500 Subject: [Fedora-directory-commits] setuputil/installer/unix uxres.cc, 1.1.1.1, 1.2 Message-ID: <200512200008.jBK08dZg016419@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/setuputil/installer/unix In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16325/installer/unix Modified Files: uxres.cc Log Message: 176156 - Allow all installer strings to be overridden by resource file settings Index: uxres.cc =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/uxres.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- uxres.cc 29 Jul 2005 22:16:32 -0000 1.1.1.1 +++ uxres.cc 20 Dec 2005 00:08:09 -0000 1.2 @@ -72,11 +72,27 @@ for (i = 0, j = 0; i < len; i++, j++) { - // Take care of backslash n for now. - if (value[i] == ' ' && value[i+1] == '\\' && value[i+2] == 'n') + // Surrounding quotes should be dropped + if ( value[i] == '"' ) { - new_value[j] = '\n'; - i += 2; + // Decrement j so we don't get an extra space + j--; + continue; + } + + // Take care of newlines and escaped quotes + if ( value[i] == '\\' ) + { + if ( value[i+1] == 'n' ) + { + new_value[j] = '\n'; + i++; + } + else if ( value[i+1] == '"' ) + { + new_value[j] = value[i+1]; + i++; + } } else { From fedora-directory-commits at redhat.com Tue Dec 20 00:08:11 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 19 Dec 2005 19:08:11 -0500 Subject: [Fedora-directory-commits] setuputil/installer/inf setup.res, NONE, 1.1 setup.inf, 1.2, 1.3 Message-ID: <200512200008.jBK08BLF016375@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/setuputil/installer/inf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16325/installer/inf Modified Files: setup.inf Added Files: setup.res Log Message: 176156 - Allow all installer strings to be overridden by resource file settings --- NEW FILE setup.res --- # ------------ Global Resources ----------- brand = "Fedora" console = "Fedora Management Console" # ------------ Welcome Dialog Resource ------------ dialog_welcome_text = "Welcome to the %s Server Products installation program\n" # %s -> brand dialog_welcome_text0 = "This program will install %s Server Products and the\n" # %s -> brand dialog_welcome_text1 = "%s on your computer.\n\nIt is recommended that you have \"root\" privilege to install the\nsoftware." # %s -> console dialog_welcome_text2 = "Tips for using the installation program:\n - Press \"Enter\" to choose the default and go to the next screen\n - Type \"Control-B\" to go back to the previous screen\n - Type \"Control-C\" to cancel the installation program\n - You can enter multiple items using commas to separate them.\n For example: 1, 2, 3 \n" dialog_welcome_prompt = "Would you like to continue with installation?" dialog_ask_options = "Please select the type of installation you would like to perform:\n\n 1. Download Only\n Download %s Server Products and run the installation at\n a later time, or copy the files to another computer and\n run the installation.\n\n" # %s -> brand dialog_ask_options0 = " 2. Download and install\n Download %s Server Products and install them on this\n computer.\n\n\nTo accept the default shown in brackets, press the Return key." # %s -> brand dialog_ask_sourceoptions = "In order to proceed with download, you need to specify the location\nfrom which it is obtained. You may download from the %s\nFTP server, or from an FTP server running on your intranet.\n\n" # %s -> brand dialog_ask_sourceoptions0 = "Please choose your desired options below:\n\n 1. Download from %s FTP server\n 2. Download from your Intranet\n\nTo accept the default shown in brackets, press the Return key." # %s -> vendor dialog_ask_vsourceoptions = "Please choose which %s FTP server you\nwish to download from:\n\nTo accept the default shown in brackets, press the Return key.\n" # %s -> vendor dialog_ask_destination = "This program will download %s Server Products into the\nfollowing directory.\nTo accept the default shown in brackets, press the Return key." # %s -> brand # ----------- License Dialog Resource ----------- dialog_license_text = "BY INSTALLING THIS SOFTWARE YOU ARE CONSENTING TO BE BOUND BY\nAND ARE BECOMING A PARTY TO THE AGREEMENT FOUND IN THE\nLICENSE.TXT FILE. IF YOU DO NOT AGREE TO ALL OF THE TERMS\nOF THIS AGREEMENT, PLEASE DO NOT INSTALL OR USE THIS SOFTWARE." dialog_license_prompt = "Do you agree to the license terms?" # ----------- Selection Dialog Resource ----------- dialog_selection_text = "%s components:" # %s -> brand dialog_selection_text0 = "The following are the %s\ncomponents currently installed on your machine:" # %s -> brand /* ----------- Client/Server Dialog Resource ---------------- */ dialog_clientorserver_text = "Select the items you would like to install:\n\n 1. %s Servers\n" # %s -> brand dialog_clientorserver_text0 = " Installs %s Servers with the integrated " # %s -> brand dialog_clientorserver_text1 = "%s Management Console\n onto your computer.\n\n" # %s -> brand dialog_clientorserver_text2 = " 2. %s Management Console\n" # %s -> brand dialog_clientorserver_text3 = " Installs %s Management Console\n as a stand-alone Java application on your computer.\n\nTo accept the default shown in brackets, press the Enter key." # %s -> brand dialog_clientorserver_prompt = "Select the component you want to install" # ----------- InstallType Dialog Resource ---------------- dialog_installtype_text = "Choose an installation type:\n\n 1. Express installation\n Allows you to quickly install the servers using the most\n common options and pre-defined defaults. Useful for quick\n evaluation of the products.\n\n 2. Typical installation\n Allows you to specify common defaults and options.\n\n 3. Custom installation\n Allows you to specify more advanced options. This is \n recommended for experienced server administrators only.\n\nTo accept the default shown in brackets, press the Enter key." dialog_installtype_prompt = "Choose an installation type" # ----------- ServerRoot Dialog Resource ---------------- dialog_serverroot_text = "This program will extract the server files and install them\ninto a directory you specify. That directory is called the \nserver root in the product documentation and will contain \nthe server programs, the Administration Server, and the server\nconfiguration files.\n\nTo accept the default shown in brackets, press the Enter key." dialog_serverroot_prompt = "Install location" # ----------- ClientRoot Dialog Resource ---------------- dialog_clientroot_text = "This program will extract the %s Management Console files and\n" # %s -> brand dialog_clientroot_text0 = "install them in a directory you specify. %s Management Console\nincludes the Java Runtime Environment and the Management \nConsole applications.\n\nTo accept the default shown in brackets, press the Enter key." # %s -> brand dialog_clientroot_prompt = "Install location" # ----------- HostName Dialog Resource ---------------- dialog_hostname_text = "Enter the fully qualified domain name of the computer\non which you're installing server software. Using the form\n.\nExample: eros.example.com.\n\nTo accept the default shown in brackets, press the Enter key." dialog_hostname_prompt = "Computer name" # ----------- SSUser Dialog Resource ---------------- dialog_ssuser_text = "Choose a Unix user and group to represent the %s server\nin the user directory. The server will run as this user.\nIt is recommended that this user should have no privileges \nin the computer network system. The Administration Server \nwill give this group some permissions in the server root\nto perform server-specific operations.\n\nIf you have not yet created a user and group for the server,\ncreate this user and group using your native UNIX\nsystem utilities.\n\n\nTo accept the default shown in brackets, press the Return key." # %s -> brand dialog_ssuser_prompt = "System User" # ----------- removeInstallInfo Dialog Resource ---------------- dialog_removeinstallinfo_text = "The installation cache \"install.inf\" generated by the setup\nprogram which is located in the directory server root/setup. This\nfile can be used as a silent installation script for installing\nsimilar servers on other computers. However, it may contain\nsensitive information such as user IDs and passwords you have\nentered.\n" dialog_removeinstallinfo_prompt = "Would you like to remove it the installation cache file?" # ----------- LdapInfo Dialog Resource ---------------- dialog_ldapinfo_text = "%s Server Products require an LDAP-based Directory\nServer for the administration of server configuration. This\nserver contains the Configuration Directory.\n\nEnter the non-secured LDAP URL of the server that contains the\nConfiguration Directory using the form:\n\n ldap://:" # %s -> brand dialog_ldapinfo_prompt = "URL of Directory Server" /* ----------- InstallDN Dialog Resource ---------------- */ dialog_installdn_text = "Please specify the name of the Administration Domain in \nthe Configuration Directory where your server configuration \ninformation is to be stored\n\nYou must have already been granted write access to this \nAdministration Domain in order to install the software.\n\nTo accept the default shown in brackets, press the Enter key." dialog_installdn_prompt = "Administration Domain name" # ----------- LdapUser Dialog Resource ---------------- dialog_ldapuser_text = "Enter the User ID or Distinguished Name of the administrator who is\nauthorized to access the Configuration Directory at" dialog_ldapuser_prompt = "Configuration Admin ID or DN:" # ----------- UserDirectoryInfo Dialog Resource ---------------- dialog_userdirectoryinfo_text = "At least one of the components to be installed requires write \naccess to the User Directory Server.\n\nEnter the non-secured LDAP URL of the User Directory in the format\nbelow:\n\n ldap://:/" dialog_userdirectoryinfo_prompt = "URL of User Directory"; # ----------- UserDirectoryAdmin Dialog Resource ---------------- dialog_userdirectoryadmin_text = "Enter the User ID or Distinguished Name of the administrator who\nhas write access the User Directory at" dialog_userdirectoryadmin_prompt = "User Directory Admin ID or DN:" # ----------- Error, warning messages ---------------- message_verifyldapinfo1 = "Enter an unsecured LDAP URL in the form\n ldap://://" message_askinstalldnnext1 = "ERROR: Enter just the name of the entry, but not\n a Distinguished Name.\n Acceptable: mcom.com\n Not Acceptable: cm=mcom.com\n" message_verifyldapuser1 = "Invalid input.\n" message_verifyldapuser2 = "Invalid URL \"%s\".\n" message_verifyldapuser3 = "Insufficient authorization.\n" message_verifyldapuser4 = "Cannot connect to the specified directory server.\n The server may be down. Check the server \n to be sure it's running before proceeding \n with installation.\n" message_verifyldapuser5 = "Invalid user and/or password.\n" message_verifyldapuser6 = "Authentication failed. Either you have entered\n an invalid user ID or password, or the directory server\n is having some problem. Please check and re-enter.\n" message_verifyinstallprivilege1 = "The Configuration Directory may not to be set up correctly for \ninstalling %s Server products. Please verify that the \no=NetscapeRoot base suffix is configured and that you have\nwrite access to that directory subtree.\n" # %s -> brand message_verifyinstallprivilege2 = "The Configuration Directory may not be set up correctly for \ninstalling %s Server products. Please contact your \n" # %s -> brand message_verifyinstallprivilege22 = "directory administrator to verify that the you have write \naccess to %s,%s\n" message_verifyinstallprivilege3 = "The Configuration Directory may not be set up correctly for \nthe installing %s Server products. Please contact\n" # %s -> brand message_verifyinstallprivilege32 = "your directory administrator to verify that the you have write\naccess to %s\n" message_verifyinstallprivilege4 = "The specified Configuration Administrator ID\n \"%s\"\n does not have sufficient write access to the Configuration\n directory. Select a user ID with write access to\n the Configuration Directory subtree.\n" message_checkserverroot1 = "The directory %s already exists and might contain\n pre-4.0 Netscape servers. Installing into an existing\n pre-4.0 server root is not supported. Choose another\n server root.\n" message_checkserverroot2 = "The server root %s already exists and contains a\n version of Netscape Server Products that is incompatible\n with this version. Choose another server root.\n" message_checkcomponentdependency1 = "A previous version of %s needs to be\ninstalled before it can be updated.\n" message_checkcomponentdependency2 = "%s depends on %s to be \n installed. Select %s.\n" message_checkcomponentdependency3 = "A previous version of %s needs to be\ninstalled before it can be patched.\n" message_checkcomponentdependency4 = "A newer version of %s is already installed.\n" message_checkcomponentdependency5 = "Target product has different version.\n" message_checkcomponentdependency6 = "Target product has different security.\n" message_verifyssuser1 = "The user ID %s does not currently exist.\n Choose another user, or create this user and start again.\n" message_verifyssuser2 = "The system will not allow you to run the\n %s servers " # %s -> brand message_verifyssuser3 = "as \"%s\". Choose another user.\n" message_verifyssgroup1 = "The user \"%s\" does not currently exist.\n Choose another user, or create this user and start again.\n" message_verifyssgroup2 = "The group \"%s\" does not currently exist.\n Choose another group, or create this group and start again.\n" message_verifyssgroup3 = "The system user \"%s\" is not in the \"%s\" group.\n Choose another user, or create this user and start again.\n" message_verifyssgroup4 = "The system will not allow you to run any %s\n" # %s -> brand message_verifyssgroup5 = " server as the user or group \"%s/%s\". Choose another user or group.\n" message_uninst_verifyselection1 = "ERROR: %s is dependent on %s.\n Please also select %s or remove\n %s first." Index: setup.inf =================================================================== RCS file: /cvs/dirsec/setuputil/installer/inf/setup.inf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- setup.inf 26 Oct 2005 16:38:11 -0000 1.2 +++ setup.inf 20 Dec 2005 00:07:11 -0000 1.3 @@ -29,11 +29,15 @@ Vendor = Fedora Project Description = Fedora Server Products Installation # Version = 1.0 -Components = svrcore, base, admin, slapd, dssynch, msg, mesg-cntrl, cert, mcc, nda, cal, enterprise, nsperl, perldap +Components = svrcore, base Mode = ALLMODES ProgramFolder = Fedora Server Products + #DefaultInstallDirectory works for NT and Unix, NT will set the drive letter to WINDISK -# DefaultInstallDirectory = /opt/fedora +DefaultInstallDirectory = /opt/fedora + +# All dialog strings can be defined in a resource file. +#Resource = setup.res # Package Contents [svrcore] @@ -42,38 +46,3 @@ [base] ComponentInfoFile = base/base.inf -[admin] -ComponentInfoFile = admin/admin.inf - -[slapd] -ComponentInfoFile = slapd/slapd.inf - -[dssynch] -ComponentInfoFile= dssynch/dssynch.inf - -[msg] -ComponentInfoFile = msg/msg.inf - -[mesg-cntrl] -ComponentInfoFile = mesg-cntrl/mesg-cntrl.inf - -[cert] -ComponentInfoFile = cert/cert.inf - -[mcc] -ComponentInfoFile = mcc/mcc.inf - -[nda] -ComponentInfoFile = nda/nda.inf - -[cal] -ComponentInfoFile = cal/cal.inf - -[enterprise] -ComponentInfoFile = enterprise/enterprise.inf - -[nsperl] -ComponentInfoFile = nsperl/nsperl.inf - -[perldap] -ComponentInfoFile = perldap/perldap.inf From fedora-directory-commits at redhat.com Tue Dec 20 00:07:13 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 19 Dec 2005 19:07:13 -0500 Subject: [Fedora-directory-commits] setuputil/installer Makefile,1.3,1.4 Message-ID: <200512200009.jBK097TZ016458@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/setuputil/installer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16325/installer Modified Files: Makefile Log Message: 176156 - Allow all installer strings to be overridden by resource file settings Index: Makefile =================================================================== RCS file: /cvs/dirsec/setuputil/installer/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 26 Oct 2005 16:38:10 -0000 1.3 +++ Makefile 20 Dec 2005 00:06:45 -0000 1.4 @@ -132,6 +132,7 @@ cp -p scripts/unzip_wrapper.pl $(PKGTOP)/bin cp -p inf/setup.inf $(PKGDIR)/bin cp -p inf/silent.inf $(PKGDIR)/bin + cp -p inf/setup.res $(PKGDIR)/bin cp -p $(OBJDIR)/LICENSE.txt $(PKGDIR)/bin cp -p $(OBJDIR)/README.txt $(PKGDIR)/bin # Create svrcore package From fedora-directory-commits at redhat.com Thu Dec 22 20:59:36 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 22 Dec 2005 15:59:36 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm filterindex.c, 1.4, 1.4.4.1 Message-ID: <200512222059.jBMKxaLt022219@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22202 Modified Files: Tag: DS71SP1_AOL_HF_Branch filterindex.c Log Message: [175897] filter'd search not returning matches after index added Index: filterindex.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/filterindex.c,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -r1.4 -r1.4.4.1 --- filterindex.c 19 Apr 2005 22:07:38 -0000 1.4 +++ filterindex.c 22 Dec 2005 20:59:28 -0000 1.4.4.1 @@ -640,7 +640,8 @@ { is_bounded_range = 0; } - if (NULL == fpairs[0] || NULL == fpairs[1]) + if (NULL == fpairs[0] || NULL == fpairs[1] || + 0 != strcmp(tpairs[0], tpairs[1]) /* avoid "&(cn<=A)(sn>=B)" type */ ) { fpairs[0] = fpairs[1] = NULL; slapi_ch_free_string(&tpairs[0]);