From fedora-directory-commits at redhat.com Mon Jul 2 18:49:31 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 2 Jul 2007 14:49:31 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/topology/customview
CustomView.java, 1.3, 1.4
Message-ID: <200707021849.l62InWAt019751@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/topology/customview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19241/src/com/netscape/management/client/topology/customview
Modified Files:
CustomView.java
Log Message:
Resolves: 246270
Summary: Parameterized version number so it's only defined in one place.
Index: CustomView.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/customview/CustomView.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CustomView.java 29 Jun 2007 20:32:29 -0000 1.3
+++ CustomView.java 2 Jul 2007 18:49:28 -0000 1.4
@@ -472,7 +472,8 @@
LDAPSearchResults result = null;
try {
result = _ldc.search(url.getDN().trim(), url.getScope(),
- url.getFilter().trim(), new String[] {"1.1.0"}, false);
+ url.getFilter().trim(),
+ new String[] {VersionInfo.getVersionNumber()}, false);
while (result != null && result.hasMoreElements()) {
LDAPEntry rscEntry = (LDAPEntry) result.next();
ResourceObject rscObj = getTopologyResource(rscEntry.getDN());
From fedora-directory-commits at redhat.com Mon Jul 2 18:49:26 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 2 Jul 2007 14:49:26 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client Framework.java, 1.3,
1.4 FrameworkInitializer.java, 1.2, 1.3
Message-ID: <200707021849.l62InuHg019772@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19241/src/com/netscape/management/client
Modified Files:
Framework.java FrameworkInitializer.java
Log Message:
Resolves: 246270
Summary: Parameterized version number so it's only defined in one place.
Index: Framework.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/Framework.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Framework.java 29 Jun 2007 20:32:27 -0000 1.3
+++ Framework.java 2 Jul 2007 18:49:16 -0000 1.4
@@ -211,7 +211,8 @@
_bannerPanel = new JPanel(new BorderLayout());
_bannerPanel.getAccessibleContext().setAccessibleDescription(
- _resource_theme.getString("banner","console"));
+ _resource_theme.getString("banner","console") + " " +
+ VersionInfo.getVersionNumber());
_bannerPanel.setBorder(
BorderFactory.createEmptyBorder(0, 0, 0, 0));
Index: FrameworkInitializer.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/FrameworkInitializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FrameworkInitializer.java 29 Jun 2007 20:32:27 -0000 1.2
+++ FrameworkInitializer.java 2 Jul 2007 18:49:18 -0000 1.3
@@ -264,7 +264,7 @@
ResourceSet themeResource = new ResourceSet("com.netscape.management.client.theme.theme");
aboutDialog = new AboutDialog(parent,
themeResource.getString("defaultAbout",
- "dialogTitle"));
+ "dialogTitle") + " " + VersionInfo.getVersionNumber());
aboutDialog.setProduct( new RemoteImage(
themeResource.getString("defaultAbout",
"productLogo")),
From fedora-directory-commits at redhat.com Mon Jul 2 18:49:27 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 2 Jul 2007 14:49:27 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/console
Console.java, 1.9, 1.10 VersionInfo.java, 1.3,
1.4 console.properties, 1.7, 1.8 genverinfo.sh, 1.3, 1.4
Message-ID: <200707021849.l62InvV4019778@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19241/src/com/netscape/management/client/console
Modified Files:
Console.java VersionInfo.java console.properties genverinfo.sh
Log Message:
Resolves: 246270
Summary: Parameterized version number so it's only defined in one place.
Index: Console.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Console.java 29 Jun 2007 20:32:28 -0000 1.9
+++ Console.java 2 Jul 2007 18:49:24 -0000 1.10
@@ -56,8 +56,8 @@
// preference information
//
public static final String IDENTIFIER = "Console";
- public static final String VERSION = "1.1.0";
- public static final String MAJOR_VERSION = "1.1";
+ public static final String VERSION = VersionInfo.getVersionNumber();
+ public static final String MAJOR_VERSION = VersionInfo.getMajorVersionNumber();
public static final String PREFERENCES_LOGIN =
IDENTIFIER + "." + VERSION + ".Login.preferences";
@@ -1559,8 +1559,8 @@
Debug.println(0,
_resource_theme.getString("console","useragent")+"/" +
- _resource.getString("console","displayVersion") +
- " B" + VersionInfo.getBuildNumber());
+ VersionInfo.getVersionNumber() + " B" +
+ VersionInfo.getBuildNumber());
if (opt.hasOption('x')) {
String extraParam = opt.getOptionParam('x');
Index: VersionInfo.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/VersionInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VersionInfo.java 24 Mar 2006 19:05:37 -0000 1.3
+++ VersionInfo.java 2 Jul 2007 18:49:24 -0000 1.4
@@ -37,6 +37,15 @@
* @return Console Version Number
*/
public static String getVersionNumber() {
+ return _resource.getString("console","versionNumber");
+ }
+
+ /**
+ * Returns major version number for the Console.
+ *
+ * @return Console Major Version Number
+ */
+ public static String getMajorVersionNumber() {
return _resource.getString("console","majorVersionNumber");
}
Index: console.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/console.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- console.properties 29 Jun 2007 20:32:28 -0000 1.7
+++ console.properties 2 Jul 2007 18:49:24 -0000 1.8
@@ -17,14 +17,10 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# END COPYRIGHT BLOCK
#
-#console-title=Fedora Management Console
-#console-useragent=Fedora-Management-Console
-console-displayVersion=1.1
login-username=User ID:
login-password=Password:
login-url=Administration URL:
-#login-title=Fedora Management Console Login
login-copyright=Copyright (C) Red Hat, Inc.
login-help=manual/en/console/help/login.htm
login-passwordDialogTitle=Bind Password
Index: genverinfo.sh
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/genverinfo.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- genverinfo.sh 24 Mar 2006 19:05:38 -0000 1.3
+++ genverinfo.sh 2 Jul 2007 18:49:24 -0000 1.4
@@ -34,6 +34,6 @@
fi
echo console-versionNumber=$2 > $1
-echo console-majorVersionNumber=$3 > $1
+echo console-majorVersionNumber=$3 >> $1
bld=`cat $4`
echo console-buildNumber=`eval eval echo $bld` >> $1
From fedora-directory-commits at redhat.com Mon Jul 2 18:49:30 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 2 Jul 2007 14:49:30 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/theme
theme.properties, 1.2, 1.3
Message-ID: <200707021850.l62Io0rr019789@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/theme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19241/src/com/netscape/management/client/theme
Modified Files:
theme.properties
Log Message:
Resolves: 246270
Summary: Parameterized version number so it's only defined in one place.
Index: theme.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/theme/theme.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- theme.properties 29 Jun 2007 20:32:28 -0000 1.2
+++ theme.properties 2 Jul 2007 18:49:25 -0000 1.3
@@ -21,9 +21,9 @@
console-title=Fedora Management Console
console-useragent=Fedora-Management-Console
login-title=Fedora Management Console Login
-banner-console=Fedora Management Console 1.1
+banner-console=Fedora Management Console
-defaultAbout-dialogTitle=Fedora Management Console 1.1
+defaultAbout-dialogTitle=Fedora Management Console
defaultAbout-productLogo=com/netscape/management/client/theme/images/logo32.gif
defaultAbout-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.
From fedora-directory-commits at redhat.com Mon Jul 2 19:44:11 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 2 Jul 2007 15:44:11 -0400
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv/node
MonitorResourceObject.java, 1.1.1.1, 1.2
Message-ID: <200707021944.l62JiB7f005568@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/node
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5440/src/com/netscape/admin/dirserv/node
Modified Files:
MonitorResourceObject.java
Log Message:
Resolves: 246513
Summary: Removed server root concept from Directory Console.
Index: MonitorResourceObject.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/node/MonitorResourceObject.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- MonitorResourceObject.java 18 Jul 2005 00:55:51 -0000 1.1.1.1
+++ MonitorResourceObject.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -111,7 +111,7 @@
_isLeaf = false;
String dn = (String)en.nextElement();
DN monitorDN = new DN( dn );
- if( monitorDN.isDescendantOf( new DN(DSUtil.LDBM_CONFIG_BASE_DN ))){
+ if( monitorDN.isDescendantOf( new DN(DSUtil.LDBM_BASE_DN ))){
MonitorDbResourceObject MonBack =
new MonitorDbResourceObject( _model, dn);
add( MonBack );
From fedora-directory-commits at redhat.com Mon Jul 2 19:44:11 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 2 Jul 2007 15:44:11 -0400
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv/panel
BackupPanel.java, 1.1.1.1, 1.2 BlankPanel.java, 1.1.1.1,
1.2 DSLogViewer.java, 1.1.1.1, 1.2 LogPanel.java, 1.1.1.1,
1.2 MappingNodeBckPanel.java, 1.1.1.1, 1.2 NewLDBMPanel.java,
1.1.1.1, 1.2 RestorePanel.java, 1.1.1.1, 1.2
Message-ID: <200707021944.l62JiB3l005577@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5440/src/com/netscape/admin/dirserv/panel
Modified Files:
BackupPanel.java BlankPanel.java DSLogViewer.java
LogPanel.java MappingNodeBckPanel.java NewLDBMPanel.java
RestorePanel.java
Log Message:
Resolves: 246513
Summary: Removed server root concept from Directory Console.
Index: BackupPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/BackupPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- BackupPanel.java 18 Jul 2005 00:55:52 -0000 1.1.1.1
+++ BackupPanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -47,12 +47,9 @@
public void init() {
- String instDir = getInstanceDirectory();
- if ( instDir != null ) {
- _baseDir = instDir + "/bak";
- }
+ _baseDir = DSUtil.getDefaultBackupPath(getModel().getServerInfo());
- _myPanel.setLayout( new GridBagLayout() );
+ _myPanel.setLayout( new GridBagLayout() );
createFileArea( _myPanel );
setDefaultDirectory();
Index: BlankPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/BlankPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- BlankPanel.java 18 Jul 2005 00:55:53 -0000 1.1.1.1
+++ BlankPanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -1029,13 +1029,6 @@
return true;
}
- /**
- * Get the directory where the server instance lives
- */
- protected String getInstanceDirectory() {
- return (String)getModel().getServerInfo().get( "serverroot" );
- }
-
static protected boolean requiresConfirmation( String item ) {
return DSUtil.requiresConfirmation( item );
}
Index: DSLogViewer.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/DSLogViewer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- DSLogViewer.java 18 Jul 2005 00:55:56 -0000 1.1.1.1
+++ DSLogViewer.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -89,6 +89,8 @@
_cbFilename.removeAllItems();
LDAPConnection ldc = getModel().getServerInfo().getLDAPConnection();
String attrs[] = { _configAttr, _configListAttr };
+ String logfile;
+ int i;
try {
LDAPEntry entry = ldc.read( _configDN, attrs );
if ( entry != null ) {
@@ -96,14 +98,42 @@
if ( attr != null ) {
Enumeration en = attr.getStringValues();
while ( en.hasMoreElements() ) {
- _cbFilename.addItem( (String)en.nextElement() );
+ // Chop off the path. We only want the filename.
+ logfile = (String)en.nextElement();
+ if ((i = logfile.lastIndexOf('/')) >= 0 ) {
+ // Make sure we're not at the end of the string
+ if ( logfile.length() > (i + 1) ) {
+ logfile = logfile.substring(i + 1);
+ } else {
+ logfile = "";
+ }
+ }
+
+ // Check if string is empty before adding
+ if (logfile.length() > 0) {
+ _cbFilename.addItem(logfile);
+ }
}
}
attr = entry.getAttribute( attrs[1] );
if ( attr != null ) {
Enumeration en = attr.getStringValues();
while ( en.hasMoreElements() ) {
- _cbFilename.addItem( (String)en.nextElement() );
+ // Chop off the path. We only want the filename.
+ logfile = (String)en.nextElement();
+ if ((i = logfile.lastIndexOf('/')) >= 0 ) {
+ // Make sure we're not at the end of the string
+ if ( logfile.length() > (i + 1) ) {
+ logfile = logfile.substring(i + 1);
+ } else {
+ logfile = "";
+ }
+ }
+
+ // Check if string is empty before adding
+ if (logfile.length() > 0) {
+ _cbFilename.addItem(logfile);
+ }
}
}
} else {
Index: LogPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/LogPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- LogPanel.java 18 Jul 2005 00:55:59 -0000 1.1.1.1
+++ LogPanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -440,7 +440,7 @@
// server, logging is implicitly disabled if there is no
// log file specified.
if (_tfLog.getText().trim().length() == 0) {
- String path = getInstanceDirectory() + File.separator + "logs" + File.separator + LOG_BASE_NAME;
+ String path = DSUtil.getDefaultLogPath(getModel().getServerInfo()) + File.separator + LOG_BASE_NAME;
_cbEnabled.setSelected(false);
_cbRotationSyncEnabled.setSelected(false);
_tfLog.setText(path);
Index: MappingNodeBckPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/MappingNodeBckPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- MappingNodeBckPanel.java 18 Jul 2005 00:55:59 -0000 1.1.1.1
+++ MappingNodeBckPanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -548,18 +548,23 @@
checkBckNumber();
} else if ( e.getSource().equals( _bLibBrowse )){
- String file = getInstanceDirectory();
- String[] extensions = { "so","dll","sl","dl", "a" };
- String[] descriptions = { DSUtil._resource.getString( "filefilter", "dynamic-lib-so" ),
+ if (isLocal()) {
+ String file = "";
+ String[] extensions = { "so","dll","sl","dl", "a" };
+ String[] descriptions = { DSUtil._resource.getString( "filefilter", "dynamic-lib-so" ),
DSUtil._resource.getString( "filefilter", "dynamic-lib-dll"),
DSUtil._resource.getString( "filefilter", "dynamic-lib-sl"),
DSUtil._resource.getString( "filefilter", "dynamic-lib-dl"),
DSUtil._resource.getString( "filefilter", "dynamic-lib-a")};
- file = DSFileDialog.getFileName(file, false, extensions,
+ file = DSFileDialog.getFileName(file, false, extensions,
descriptions, this);
- if ( file != null) {
- _LibText.setText( file );
- }
+ if ( file != null) {
+ _LibText.setText( file );
+ }
+ } else {
+ // Must be local to browse
+ DSUtil.showErrorDialog( getModel().getFrame(), "error-not-local", "", _section);
+ }
} else {
Debug.println(" MappingNodeSettingPanel.actionPerformed() : wrong action performed");
}
@@ -631,12 +636,12 @@
if(( _isLibDirty ) &&
(( sFunction == null ) ||
(sFunction.trim().length() == 0)) ) {
- DSUtil.showErrorDialog( getModel().getFrame(),"error-no-funct", "");
+ DSUtil.showErrorDialog( getModel().getFrame(), "error-no-funct", "", _section);
return;
}
if(( _isFctDirty ) &&
(( sLib == null) || ( sLib.trim().length() == 0 ))) {
- DSUtil.showErrorDialog( getModel().getFrame(),"error-no-lib","");
+ DSUtil.showErrorDialog( getModel().getFrame(), "error-no-lib", "", _section);
return;
}
prepSaveDistrib( attrs );
@@ -706,12 +711,12 @@
if(( _isLibDirty ) &&
(( sFunction == null ) ||
(sFunction.trim().length() == 0)) ) {
- DSUtil.showErrorDialog( getModel().getFrame(),"error-no-funct", "");
+ DSUtil.showErrorDialog( getModel().getFrame(), "error-no-funct", "", _section);
return( false ) ;
}
if(( _isFctDirty ) &&
(( sLib == null) || ( sLib.trim().length() == 0 ))) {
- DSUtil.showErrorDialog( getModel().getFrame(),"error-no-lib","");
+ DSUtil.showErrorDialog( getModel().getFrame(), "error-no-lib", "", _section);
return( false );
}
prepSaveDistrib( attrs );
Index: NewLDBMPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/NewLDBMPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- NewLDBMPanel.java 18 Jul 2005 00:56:01 -0000 1.1.1.1
+++ NewLDBMPanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -61,10 +61,7 @@
// Physical DB info
createFileArea( _myPanel );
- String instDir = getInstanceDirectory();
- if ( instDir != null ) {
- _baseDir = instDir;
- }
+ _baseDir = DSUtil.getDefaultDBPath( getModel().getServerInfo() );
AbstractDialog dlg = getAbstractDialog();
if ( dlg != null ) {
Index: RestorePanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/RestorePanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- RestorePanel.java 18 Jul 2005 00:56:03 -0000 1.1.1.1
+++ RestorePanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -56,10 +56,7 @@
_myPanel.setLayout( new GridBagLayout() );
createFileArea( _myPanel, dirList );
- String instDir = getInstanceDirectory();
- if ( instDir != null ) {
- _baseDir = instDir + "/bak";
- }
+ String _baseDir = DSUtil.getDefaultBackupPath(getModel().getServerInfo());
SimpleDialog dlg = getSimpleDialog();
if ( dlg != null ) {
From fedora-directory-commits at redhat.com Mon Jul 2 19:44:13 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 2 Jul 2007 15:44:13 -0400
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv/panel/replication
LegacySupplierSettingPanel.java, 1.1.1.1,
1.2 ReplicationAgreement.java, 1.1.1.1,
1.2 SupplierSettingPanel.java, 1.1.1.1, 1.2
Message-ID: <200707021944.l62JiDf4005588@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5440/src/com/netscape/admin/dirserv/panel/replication
Modified Files:
LegacySupplierSettingPanel.java ReplicationAgreement.java
SupplierSettingPanel.java
Log Message:
Resolves: 246513
Summary: Removed server root concept from Directory Console.
Index: LegacySupplierSettingPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication/LegacySupplierSettingPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- LegacySupplierSettingPanel.java 18 Jul 2005 00:56:07 -0000 1.1.1.1
+++ LegacySupplierSettingPanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -396,11 +396,7 @@
}
private void SetDefaultDir () {
- String dir = getInstanceDirectory () + "/" + DEFAULT_DBDIR;
-
- /* replace all \ with / in the path */
- dir = dir.replace('\\', '/');
-
+ String dir = DSUtil.getDefaultChangelogPath( getModel().getServerInfo() );
_dbText.setText(dir);
}
@@ -892,7 +888,6 @@
private static int DEFAULT_AGE_UNIT = DAY_AGE_UNIT; //day
private static final String REMOVE = "remove";
- private static final String DEFAULT_DBDIR = "changelogdb";
private static final String DEFAULT_SUFFIX = "cn=changelog";
private static final String CONFIG_DN = "cn=config";
private static final String PRIVATE_SUFFIX_ATTR = "nsslapd-privatenamespaces";
Index: ReplicationAgreement.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication/ReplicationAgreement.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ReplicationAgreement.java 18 Jul 2005 00:56:09 -0000 1.1.1.1
+++ ReplicationAgreement.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -873,7 +873,7 @@
if (backendName == null) {
return false;
}
- String dnDB = "cn="+backendName+"," + DSUtil.LDBM_CONFIG_BASE_DN;
+ String dnDB = "cn="+backendName+"," + DSUtil.LDBM_BASE_DN;
/* Get read-only state of database */
try {
@@ -921,7 +921,7 @@
if (backendName == null) {
return false;
}
- String dnDB = "cn="+backendName+"," + DSUtil.LDBM_CONFIG_BASE_DN;
+ String dnDB = "cn="+backendName+"," + DSUtil.LDBM_BASE_DN;
/* Get read-only state of database */
try {
wasReadOnly = ReadOnly.isReadOnly( model.getServerInfo(), dnDB );
Index: SupplierSettingPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication/SupplierSettingPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- SupplierSettingPanel.java 18 Jul 2005 00:56:10 -0000 1.1.1.1
+++ SupplierSettingPanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -291,11 +291,7 @@
}
private void SetDefaultDir () {
- String dir = getInstanceDirectory () + "/" + DEFAULT_DBDIR;
-
- /* replace all \ with / in the path */
- dir = dir.replace('\\', '/');
-
+ String dir = DSUtil.getDefaultChangelogPath( _model.getServerInfo() );
_dbText.setText(dir);
}
@@ -953,7 +949,6 @@
private static int DEFAULT_AGE_UNIT = DAY_AGE_UNIT; //day
private static final String REMOVE = "remove";
- private static final String DEFAULT_DBDIR = "changelogdb";
private static ResourceSet _resource =
new ResourceSet("com.netscape.admin.dirserv.panel.replication.replication");
From fedora-directory-commits at redhat.com Mon Jul 2 19:44:13 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 2 Jul 2007 15:44:13 -0400
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv/task
NewInstanceDialog.java, 1.1.1.1, 1.2
Message-ID: <200707021944.l62JiDpi005595@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/task
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5440/src/com/netscape/admin/dirserv/task
Modified Files:
NewInstanceDialog.java
Log Message:
Resolves: 246513
Summary: Removed server root concept from Directory Console.
Index: NewInstanceDialog.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/task/NewInstanceDialog.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- NewInstanceDialog.java 18 Jul 2005 00:56:18 -0000 1.1.1.1
+++ NewInstanceDialog.java 2 Jul 2007 19:44:11 -0000 1.2
@@ -46,13 +46,12 @@
/**
* Creates a dialog which asks the user to input the basic parameters
* needed to create a new DS instance. All of the other needed basic
- * information is derived from the server root directory or other
- * information stored in the topology. The parameters may be given
- * default values in the constructor. If the default value given is
- * null, this means to disable that field. If the default value given
- * is "" the empty string, enable the field with an empty value.
- * If root DN is null the root DN password entry field will be disabled
- * as well.
+ * information is derived from other information stored in the topology.
+ * The parameters may be given default values in the constructor. If
+ * the default value given is null, this means to disable that field.
+ * If the default value given is "" the empty string, enable the field
+ * with an empty value. If root DN is null the root DN password entry
+ * field will be disabled as well.
*
* @param parent Parent container.
*/
From fedora-directory-commits at redhat.com Mon Jul 2 19:44:10 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 2 Jul 2007 15:44:10 -0400
Subject: [Fedora-directory-commits] directoryconsole build.properties, 1.6,
1.7 build.xml, 1.7, 1.8
Message-ID: <200707021944.l62JienT005685@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5440
Modified Files:
build.properties build.xml
Log Message:
Resolves: 246513
Summary: Removed server root concept from Directory Console.
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.properties 29 Sep 2006 17:17:26 -0000 1.6
+++ build.properties 2 Jul 2007 19:44:08 -0000 1.7
@@ -21,8 +21,8 @@
lang=en
ldapconsole.root=..
-ldapconsole.version=1.0.3
-ldapconsole.gen.version=1.0
+ldapconsole.version=1.1.0
+ldapconsole.gen.version=1.1
brand=fedora
ldapconsole.name=${brand}-ds-${ldapconsole.version}
ldapconsole.gen.name=${brand}-ds-${ldapconsole.gen.version}
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 24 Mar 2006 00:52:51 -0000 1.7
+++ build.xml 2 Jul 2007 19:44:08 -0000 1.8
@@ -82,10 +82,10 @@
-
-
-
-
+
+
+
+
@@ -149,12 +149,6 @@
-
-
-
-
-
-
From fedora-directory-commits at redhat.com Mon Jul 2 19:44:10 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 2 Jul 2007 15:44:10 -0400
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv DSAdmin.java,
1.3, 1.4 DSUtil.java, 1.1.1.1, 1.2 dirserv.properties, 1.5, 1.6
Message-ID: <200707021944.l62JieHx005689@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5440/src/com/netscape/admin/dirserv
Modified Files:
DSAdmin.java DSUtil.java dirserv.properties
Log Message:
Resolves: 246513
Summary: Removed server root concept from Directory Console.
Index: DSAdmin.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSAdmin.java 28 Oct 2005 22:18:17 -0000 1.3
+++ DSAdmin.java 2 Jul 2007 19:44:08 -0000 1.4
@@ -208,7 +208,6 @@
int securePort = 0;
String baseDN = null;
String sServerID = null; // Instance of DS server
- String installPath = null; // Path where server is installed
try {
LDAPConnection ldc = _info.getLDAPConnection();
if ( ldc == null ) {
@@ -225,7 +224,6 @@
baseDN = getAttrVal( entry, "nsBaseDN" );
_bindDN = getAttrVal( entry, "nsBindDN" );
sServerID = getAttrVal( entry, "nsServerID" );
- installPath = getAttrVal ( entry, "serverroot");
if ( (host == null) || (sPort == null) ||
(baseDN == null) || (sServerID == null) ) {
@@ -347,9 +345,6 @@
/* For the key and cert wizard */
_serverInfo.put( "SIE", sServerID );
- /* Save the install path */
- _serverInfo.put( "InstallPath", installPath);
-
Debug.println(9, "DSAdmin.getInfo: OS = " + _info.getAdminOS() );
/*
@@ -749,9 +744,6 @@
things statically across server instances */
DSUtil.initialize( ldc, _serverInfo.getAuthenticationDN() );
- // set the server root for other directory console classes to use
- readServerRoot();
-
// create new frame
_serverInfo.frame = null;
_pagefeeder = new DSPageFeeder( this, _info, _serverInfo );
@@ -824,10 +816,6 @@
}
}
- private void readServerRoot() {
- DSUtil.readServerRoot(_info, _serverInfo, null);
- }
-
private void startUpdater() {
_animate = true;
@@ -1231,7 +1219,7 @@
private boolean checkVersion(ConsoleInfo info) {
String version = null;
JFrame frame = UtilConsoleGlobals.getActivatedFrame();
- version = VersionInfo.getVersionNumber();
+ version = VersionInfo.getMajorVersionNumber();
try {
Float f = new Float(version);
Index: DSUtil.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSUtil.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- DSUtil.java 18 Jul 2005 00:55:42 -0000 1.1.1.1
+++ DSUtil.java 2 Jul 2007 19:44:08 -0000 1.2
@@ -23,6 +23,7 @@
import java.awt.*;
import java.awt.image.*;
import java.util.*;
+import java.util.regex.*;
import java.io.*;
import java.net.*;
import java.text.SimpleDateFormat;
@@ -236,74 +237,6 @@
return (result == AUTH_SUCCESS);
}
- /**
- * Reads server root and writes it to the serverInfo provided with the key
- * "serverroot".
- *
- * @param consoleInfo ConsoleInfo; the ConsoleInfo of the admin console
- * @param frame Parent frame for error dialogs
- * @param serverInfo ConsoleInfo; the ConsoleInfo of the server we are connected to
- *
- */
- static public void readServerRoot(ConsoleInfo consoleInfo,
- ConsoleInfo serverInfo,
- JFrame frame) {
- String root = null;
- String authName = null;
- /* Get the server root */
- if (serverInfo != null) {
- LDAPConnection ldc = serverInfo.getLDAPConnection();
- authName = ldc.getAuthenticationDN();
- LDAPEntry entry = null;
- Debug.println(9, "DSUtil.readServerRoot ldc=" + format(ldc));
- try {
- String[] attrs = { INSTANCE_ATTR, SECURITY_ATTR };
- entry = ldc.read( "cn=config", attrs );
- Debug.println(9, "DSUtil.readServerRoot entry=" + entry);
- root = getAttrValue(entry, INSTANCE_ATTR);
- String secValue = getAttrValue(entry, SECURITY_ATTR);
- } catch ( LDAPException e ) {
- Debug.println("DSUtil.readServerRoot(): exception " + e);
- Debug.println( "DSUtil.readServerRoot: cannot read " +
- "cn=config ldc " +
- (ldc.isConnected() ? "is" : "is not") +
- " connected, bind DN = " +
- ldc.getAuthenticationDN());
- }
- }
-
- /* Get the server root from the SIE */
- if (root == null && consoleInfo != null) {
- LDAPConnection ldc = consoleInfo.getLDAPConnection();
- authName = ldc.getAuthenticationDN();
- LDAPEntry entry = null;
- Debug.println(9, "DSUtil.readServerRoot console ldc=" +
- format(ldc));
- try {
- String[] attrs = { "serverroot" };
- entry = ldc.read( consoleInfo.getCurrentDN(), attrs );
- Debug.println(9, "DSUtil.readServerRoot entry=" + entry);
- root = getAttrValue(entry, "serverroot");
- } catch ( LDAPException e ) {
- Debug.println("DSUtil.readServerRoot(): exception " + e);
- Debug.println( "DSUtil.readServerRoot: cannot read " +
- consoleInfo.getCurrentDN() +
- " ldc " +
- (ldc.isConnected() ? "is" : "is not") +
- " connected, bind DN = " +
- ldc.getAuthenticationDN());
- }
- }
-
- if (root == null && frame != null) {
- showErrorDialog( frame, "config-privilege", authName );
- } else if (root != null && serverInfo != null) {
- serverInfo.put("serverroot", root);
- }
-
- return;
- }
-
/**
* Returns the name of the server instance corresponding to the server connection.
@@ -2344,7 +2277,7 @@
}
LDAPSearchResults res = null;
try {
- res = ldc.search(LDBM_CONFIG_BASE_DN, ldc.SCOPE_SUB,
+ res = ldc.search(LDBM_BASE_DN, ldc.SCOPE_SUB,
filter, null, false);
while (res.hasMoreElements()) {
LDAPEntry entry = (LDAPEntry)res.nextElement();
@@ -2821,49 +2754,98 @@
}
/**
+ * Returns the default path used for backups.
+ *
+ * @param info serverInfo, information for the current server
+ *
+ * @return the default backup path
+ */
+ public static String getDefaultBackupPath(ConsoleInfo serverInfo) {
+ return getDefaultDSPath( serverInfo, CONFIG_BASE_DN, BAKDIR_ATTR );
+ }
+
+ /**
+ * Returns the default path used to store the changelog database.
+ *
+ * @param info serverInfo, information for the current server
+ *
+ * @return the default changelog database path
+ */
+ public static String getDefaultChangelogPath(ConsoleInfo serverInfo) {
+ String path = getDefaultDBPath( serverInfo );
+
+ // We want the changelog path to be at the same level as the db directory.
+ Matcher matcher = Pattern.compile("/db$").matcher( path );
+ return matcher.replaceAll("/" + CHANGELOG_DIR);
+ }
+
+ /**
+ * Returns the default path used to store database files.
+ *
+ * @param info serverInfo, information for the current server
+ *
+ * @return the default database path
+ */
+ public static String getDefaultDBPath(ConsoleInfo serverInfo) {
+ return getDefaultDSPath( serverInfo, LDBM_CONFIG_BASE_DN, DBDIR_ATTR );
+ }
+
+ /**
* Returns the default path used to store the LDIF files.
- * Returns a path of type /usr/fedora/servers/slapd-host/ldif/.
- * If something is wrong returns the parent path (../)
*
* @param info serverInfo, information for the current server
*
- * @return the name of the instance
+ * @return the default LDIF path
*/
- public static String getDefaultLDIFPath(ConsoleInfo serverInfo) {
- String defaultPath = "";
- if (serverInfo != null) {
- String installPath = (String) serverInfo.get("InstallPath");
-
- if (installPath != null) {
- /* We get the OS of the server we are working with from the admin */
- String separator = "\\";
- if (!isNT(serverInfo)) {
- separator = "/";
- }
- String slapd = (String)serverInfo.get("ServerInstance");
- if (slapd != null) {
- /* The slapd variable contains now the 'slapd-' */
- defaultPath = installPath + separator +
- slapd + separator +
- "ldif" + separator;
- }
- }
- }
-
- File defaultPathFile = new File(defaultPath);
- if (!defaultPathFile.exists() &&
- isLocal(serverInfo.getHost())) {
- Debug.println("DSUtil.getDefaultLDIFPath() : "+defaultPath+" does not exist");
- String separator = "\\";
- if (serverInfo != null) {
- if (!isNT(serverInfo)) {
- separator = "/";
- }
- }
- defaultPath = ".."+separator;
- }
- return defaultPath;
- }
+ public static String getDefaultLDIFPath(ConsoleInfo serverInfo) {
+ return getDefaultDSPath( serverInfo, CONFIG_BASE_DN, LDIFDIR_ATTR );
+ }
+
+ /**
+ * Returns the default path used to store the server log files.
+ *
+ * @param info serverInfo, information for the current server
+ *
+ * @return the default server logfile path
+ */
+ public static String getDefaultLogPath(ConsoleInfo serverInfo) {
+ String path = getDefaultDSPath( serverInfo, CONFIG_BASE_DN, LOGDIR_ATTR );
+
+ // There is no logdir attribute, so we get the errorlog location and
+ // trim off the logfile name to get the default path.
+ Matcher matcher = Pattern.compile("/errors$").matcher( path );
+ return matcher.replaceAll("");
+ }
+
+ private static String getDefaultDSPath(ConsoleInfo serverInfo,
+ String entry,
+ String pathAttr) {
+ String defaultPath = "";
+
+ if (serverInfo != null) {
+ LDAPConnection ldc = serverInfo.getLDAPConnection();
+ if ( reconnect( ldc ) ) {
+ try {
+ /* Lookup the path from the server config */
+ String[] attrs = { pathAttr };
+ LDAPEntry lde = ldc.read(entry, attrs);
+ defaultPath = getAttrValue(lde, pathAttr);
+ } catch ( LDAPException e ) {
+ Debug.println("DSUtil.getDefaultDSPath() : Caught ldap exception + e");
+ }
+ }
+ } else {
+ Debug.println("DSUtil.getDefaultDSPath() : serverInfo is null");
+ }
+
+ File defaultPathFile = new File(defaultPath);
+ if (!defaultPathFile.exists() &&
+ isLocal(serverInfo.getHost())) {
+ Debug.println("DSUtil.getDefaultDSPath() : " + defaultPath + " does not exist");
+ }
+
+ return defaultPath;
+ }
/**
* Gets a boolean valued attribute from a properties file. Values meaning
@@ -2927,6 +2909,11 @@
public static final String AUTH_CHANGE_LISTENERS = "AuthChangeListeners";
private static final String INSTANCE_ATTR = "nsslapd-instancedir";
private static final String SECURITY_ATTR = "nsslapd-security";
+ private static final String BAKDIR_ATTR = "nsslapd-bakdir";
+ private static final String DBDIR_ATTR = "nsslapd-directory";
+ private static final String LDIFDIR_ATTR = "nsslapd-ldifdir";
+ private static final String LOGDIR_ATTR = "nsslapd-errorlog";
+ private static final String CHANGELOG_DIR = "changelogdb";
private static final ResourceSet _helpResource =
new ResourceSet("com.netscape.admin.dirserv.dirserv-help");
static public ResourceSet _resource =
@@ -2937,8 +2924,10 @@
private static int _local = -1;
+ static public final String CONFIG_BASE_DN = "cn=config";
static public final String PLUGIN_CONFIG_BASE_DN = "cn=plugins,cn=config";
- static public final String LDBM_CONFIG_BASE_DN = "cn=ldbm database,cn=plugins,cn=config";
+ static public final String LDBM_BASE_DN = "cn=ldbm database,cn=plugins,cn=config";
+ static public final String LDBM_CONFIG_BASE_DN = "cn=config,cn=ldbm database,cn=plugins,cn=config";
static public final String CHAINING_CONFIG_BASE_DN = "cn=chaining database,cn=plugins,cn=config";
static public final String DEFAULT_DB_INSTANCE_FILTER = "objectclass=nsBackendInstance";
static public final String MAPPING_TREE_BASE_DN = "cn=mapping tree,cn=config";
Index: dirserv.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/dirserv.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dirserv.properties 29 Sep 2006 17:17:26 -0000 1.5
+++ dirserv.properties 2 Jul 2007 19:44:08 -0000 1.6
@@ -2657,9 +2657,13 @@
mappingtree-backend-bdelete-ttip=Remove a database from the list
mappingtree-backend-bck-list-label=Databases containing entries for this suffix:
mappingtree-backend-bck-list-ttip=Select the database(s) managed by this suffix from the list.
-mappingtree-backend-error-no-funct-label=The function name is missing
-mappingtree-backend-error-no-lib-label=The library path is missing
-mappingtree-backend-update-error-title=Failed to Update Databases Info
+mappingtree-backend-error-no-funct-msg=The distribution library function name is missing.
+mappingtree-backend-error-no-funct-title=Distribution Plugin Error
+mappingtree-backend-error-no-lib-msg=The distribution library path is missing.
+mappingtree-backend-error-no-lib-title=Distribution Plugin Error
+mappingtree-backend-error-not-local-msg=You must be local to the server to browse for distribution libraries.
+mappingtree-backend-error-not-local-title=Browsing Error
+mappingtree-backend-update-error-title=Failed to Update Databases Info.
mappingtree-backend-update-error-msg=Error updating :%1 \n %2
mappingtree-backend-add-backend-description=Use this dialog to choose a database to add to this suffix
From fedora-directory-commits at redhat.com Mon Jul 2 19:44:11 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 2 Jul 2007 15:44:11 -0400
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv/also
Danny-Atul-To.jpg, NONE, 1.1 files.lst, 1.1, 1.2 Danny, Atul,
To.jpg, 1.1.1.1, NONE
Message-ID: <200707021944.l62JifC5005693@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/also
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5440/src/com/netscape/admin/dirserv/also
Modified Files:
files.lst
Added Files:
Danny-Atul-To.jpg
Removed Files:
Danny, Atul,To.jpg
Log Message:
Resolves: 246513
Summary: Removed server root concept from Directory Console.
Index: files.lst
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/also/files.lst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- files.lst 18 Jul 2005 01:02:41 -0000 1.1
+++ files.lst 2 Jul 2007 19:44:08 -0000 1.2
@@ -3,7 +3,7 @@
Anthony.jpg
Bindu.jpg
Chandra.jpg
-Danny, Atul,To.jpg
+Danny-Atul-To.jpg
Darshan.jpg
Ey.jpg
Frank.jpg
***** Not enough context to create diffstat for file: Danny,
***** Not enough context to create diff for file: Danny,
From fedora-directory-commits at redhat.com Mon Jul 2 19:44:11 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 2 Jul 2007 15:44:11 -0400
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv/logging
DSLogViewerModel.java, 1.1.1.1, 1.2
Message-ID: <200707021944.l62JifxK005696@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/logging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5440/src/com/netscape/admin/dirserv/logging
Modified Files:
DSLogViewerModel.java
Log Message:
Resolves: 246513
Summary: Removed server root concept from Directory Console.
Index: DSLogViewerModel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/logging/DSLogViewerModel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- DSLogViewerModel.java 18 Jul 2005 00:55:49 -0000 1.1.1.1
+++ DSLogViewerModel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -31,8 +31,8 @@
public class DSLogViewerModel extends DefaultTableModel {
public DSLogViewerModel(ConsoleInfo consoleInfo, String url) {
- _url = consoleInfo.getAdminURL() +
- consoleInfo.get( "ServerInstance" ) + "/" + url;
+ _serverID = (String)consoleInfo.get( "ServerInstance" );
+ _url = consoleInfo.getAdminURL() + _serverID + "/" + url;
_password = consoleInfo.getAuthenticationPassword();
_username = (String)consoleInfo.get( GlobalConstants.TASKS_AUTH_DN );
_password = (String)consoleInfo.get( GlobalConstants.TASKS_AUTH_PWD );
@@ -65,41 +65,46 @@
return false;
}
- /**
- * Fetch data from Directory/Admin Server.
- *
- */
+ /**
+ * Fetch data from Directory/Admin Server.
+ *
+ */
public void updateLogData() {
if (!_updating) {
_updating = true; // this gets reset in derived classes finish()
- /* Tack the log file name on to the URL */
- Hashtable args = new Hashtable();
- args.put("logfile", getLogFileName());
- /* Tack on the number of lines to return */
- args.put("num", Integer.toString(getLineCount()));
- /* If a filter string was specified, tack that on */
- if ( getFilter() != null )
- args.put("str", getFilter());
- try {
- URL url = new URL( _url );
- Debug.println( "DSLogViewerModel.updateLogData: " + url );
- HttpManager _httpManager = new HttpManager();
- // tell the http manager to use UTF8 encoding
- _httpManager.setSendUTF8(true);
- InputStream data = CGIReportTask.encode(args);
- _httpManager.post(url, getCommClient(), null, data, data.available(),
- CommManager.FORCE_BASIC_AUTH|
- CommManager.ASYNC_RESPONSE);
- waitForFinish();
- }
- catch (Exception e) {
- Debug.println( "DSLogViewerModel.updateLogData for " +
- _url + ": " + e );
- }
- fireTableDataChanged();
+ Hashtable args = new Hashtable();
+ /* Set which server's log you want */
+ args.put("id", _serverID);
+ /* Set which logfile you want to view */
+ args.put("file", getLogFileName());
+ /* Tack on the number of lines to return */
+ args.put("num", Integer.toString(getLineCount()));
+ /* We only want the CGI to return raw log content */
+ args.put("nohtml", "1");
+ /* If a filter string was specified, tack that on */
+ if ( getFilter() != null )
+ args.put("str", getFilter());
+ try {
+ URL url = new URL( _url );
+ Debug.println( "DSLogViewerModel.updateLogData: " + url );
+ HttpManager _httpManager = new HttpManager();
+ // tell the http manager to use UTF8 encoding
+ _httpManager.setSendUTF8(true);
+ InputStream data = CGIReportTask.encode(args);
+ _httpManager.post(url, getCommClient(), null,
+ data, data.available(),
+ CommManager.FORCE_BASIC_AUTH|
+ CommManager.ASYNC_RESPONSE);
+ waitForFinish();
+ }
+ catch (Exception e) {
+ Debug.println( "DSLogViewerModel.updateLogData for " +
+ _url + ": " + e );
+ }
+ fireTableDataChanged();
Debug.println("DSLogViewerModel done requesting");
}
- }
+ }
public void updateLogLength() {
}
@@ -224,6 +229,7 @@
protected String _url;
String _username;
String _password;
+ private String _serverID = null;
private String _logName = null;
protected static ResourceSet _resource;
protected static String _section;
From fedora-directory-commits at redhat.com Mon Jul 2 19:47:58 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 2 Jul 2007 15:47:58 -0400
Subject: [Fedora-directory-commits] directoryconsole fedora-ds-console.spec,
NONE, 1.1
Message-ID: <200707021947.l62JlwDn005925@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5899
Added Files:
fedora-ds-console.spec
Log Message:
Summary: Initial fedora-ds-console specfile.
--- NEW FILE fedora-ds-console.spec ---
%define major_version 1.1
%define minor_version 0
Name: fedora-ds-console
Version: %{major_version}.%{minor_version}
Release: 1
Group: Applications
Vendor: Fedora Project
URL: http://directory.fedora.redhat.com
License: LGPL
Packager: Red Hat, Inc.
Summary: Fedora Directory Server Management Console
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildArch: noarch
Source: %{name}-%{version}.tar.gz
Autoreq: 0
AutoReqProv: no
BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, fedora-console-framework >= 1.1
%description
A Java based remote management console used for Managing Fedora
Directory Server.
# prep and setup expect there to be a Source file
# in the /usr/src/redhat/SOURCES directory - it will be unpacked
# in the _builddir (not BuildRoot)
%prep
%setup -q
%build
cd directoryconsole
ant -Dconsole.location=/usr/share/java
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/usr/share/java
install -m777 built/package/fedora-ds* $RPM_BUILD_ROOT/usr/share/java
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
/usr/share/java/fedora-ds-%{version}.jar
/usr/share/java/fedora-ds-%{version}_en.jar
%post
cd /usr/share/java
ln -s fedora-ds-%{version}.jar fedora-ds-%{major_version}.jar
ln -s fedora-ds-%{version}.jar fedora-ds.jar
ln -s fedora-ds-%{version}_en.jar fedora-ds-%{major_version}_en.jar
ln -s fedora-ds-%{version}_en.jar fedora-ds_en.jar
%preun
rm -rf /usr/share/java/fedora-ds-%{major_version}.jar
rm -rf /usr/share/java/fedora-ds.jar
rm -rf /usr/share/java/fedora-ds-%{major_version}_en.jar
rm -rf /usr/share/java/fedora-ds_en.jar
%changelog
* Mon Nov 14 2005 Nathan Kinder 1.1.0-1
- Initial creation
From fedora-directory-commits at redhat.com Tue Jul 3 17:27:05 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 3 Jul 2007 13:27:05 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/topology
AbstractServerObject.java, 1.2, 1.3 ServerNode.java, 1.2, 1.3
Message-ID: <200707031727.l63HR5p7020559@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/topology
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20520/src/com/netscape/management/client/topology
Modified Files:
AbstractServerObject.java ServerNode.java
Log Message:
Resolves: 246651
Summary: Cleaned up dialogs when a jar file is unable to be downloaded.
Index: AbstractServerObject.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/AbstractServerObject.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractServerObject.java 29 Jun 2007 20:32:29 -0000 1.2
+++ AbstractServerObject.java 3 Jul 2007 17:27:03 -0000 1.3
@@ -540,7 +540,7 @@
// activated before any change listener is registered
while (_running && _changeListeners.size() == 0) {
try {
- Debug.println(7, "AbstractServerObject.StatusThread: waiting for chanage listeners to register");
+ Debug.println(7, "AbstractServerObject.StatusThread: waiting for change listeners to register");
_sleeping = true;
Thread.currentThread().sleep(1000);
_sleeping = false;
Index: ServerNode.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/ServerNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerNode.java 29 Nov 2005 18:37:12 -0000 1.2
+++ ServerNode.java 3 Jul 2007 17:27:03 -0000 1.3
@@ -1231,7 +1231,7 @@
{
setBusyIndicator(null, false, "");
if(!isDownloaded) {
- // statusDialog.setVisible(false);
+ statusDialog.setVisible(false);
}
JOptionPane.showMessageDialog(parentFrame,
e.getMessage(),
From fedora-directory-commits at redhat.com Tue Jul 3 17:27:06 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 3 Jul 2007 13:27:06 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/util
default.properties, 1.1.1.1, 1.2
Message-ID: <200707031727.l63HR6sB020565@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20520/src/com/netscape/management/client/util
Modified Files:
default.properties
Log Message:
Resolves: 246651
Summary: Cleaned up dialogs when a jar file is unable to be downloaded.
Index: default.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/default.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- default.properties 18 Jul 2005 00:34:27 -0000 1.1.1.1
+++ default.properties 3 Jul 2007 17:27:03 -0000 1.2
@@ -73,7 +73,7 @@
error-CanNotConnect=Can not connect to {0}
error-SaveFile=Can not save file as {0}
error-ClassNotFound=Class {0} not found
-error-InstallError=Failed to install a local copy of {0} or one of its supporting files:
+error-InstallError=Failed to install a local copy of {0} or one of its supporting files.\nPlease ensure that the appropriate console package is installed on the Administration Server.
# Messages for LDAPOutputStream
error-CannotModify1=Cannot modify entry, does not exist:
From fedora-directory-commits at redhat.com Tue Jul 3 22:32:37 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 3 Jul 2007 18:32:37 -0400
Subject: [Fedora-directory-commits] adminserver/tests/ds_create - New
directory
Message-ID: <200707032232.l63MWbEE021339@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/tests/ds_create
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21324/ds_create
Log Message:
Directory /cvs/dirsec/adminserver/tests/ds_create added to the repository
From fedora-directory-commits at redhat.com Wed Jul 4 01:28:19 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 3 Jul 2007 21:28:19 -0400
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.47,
1.48 aclocal.m4, 1.39, 1.40 configure, 1.50, 1.51 missing,
1.29, 1.30 install-sh, 1.29, 1.30 depcomp, 1.29, 1.30 compile,
1.29, 1.30 config.sub, 1.28, 1.29 config.guess, 1.28,
1.29 Makefile.in, 1.56, 1.57
Message-ID: <200707040128.l641SJAI029065@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29013/ldapserver
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh depcomp
compile config.sub config.guess Makefile.in
Log Message:
Resolves: bug 246683
Bug Description: Reimplement ds_create without setuputil code
Reviewed by: nhosoi (Thanks!)
Fix Description: ds_create was a CGI program that would create a new instance, set it up to be managed by console, and register it with the config ds. The new ds_create CGI perl script does just that. One tricky part was that, rather than enabling the pass through auth plugin and having to restart the server, the new server is created without being started, then the modification is done to the new server dse.ldif file directly, using the new FileConn.pm module, which simulates a Mozilla::LDAP::Conn on an LDIF file. This also allows us to create a new instance with a pre-hashed rootdn password, rather than having to send the cleartext password.
I had to move around some code in AdminServer and AdminUtil so that I could use it from ds_create. I also implemented support for the admin server PASSWORD_PIPE in perl so we could use it in other CGI perl scripts.
Finally, the error handling was not consistent in our code, so I made explicit the passing of error messages up and down the stack. Oh how I wish we could just do this in python and use exception handling . . .
I added a test for ds_create.
Platforms tested: RHEL4
Flag Day: Yes - autotool changes
Doc impact: No. Should work the same way as the old ds_create.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile.am 29 Jun 2007 21:12:21 -0000 1.47
+++ Makefile.am 4 Jul 2007 01:28:17 -0000 1.48
@@ -200,7 +200,8 @@
ldap/admin/src/scripts/DSDialogs.pm \
ldap/admin/src/scripts/Setup.pm \
ldap/admin/src/scripts/Migration.pm \
- ldap/admin/src/scripts/DSMigration.pm
+ ldap/admin/src/scripts/DSMigration.pm \
+ ldap/admin/src/scripts/FileConn.pm
property_DATA = ldap/admin/src/scripts/setup-ds.res \
ldap/admin/src/scripts/migrate-ds.res
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- Makefile.in 29 Jun 2007 21:12:21 -0000 1.56
+++ Makefile.in 4 Jul 2007 01:28:17 -0000 1.57
@@ -1137,7 +1137,8 @@
ldap/admin/src/scripts/DSDialogs.pm \
ldap/admin/src/scripts/Setup.pm \
ldap/admin/src/scripts/Migration.pm \
- ldap/admin/src/scripts/DSMigration.pm
+ ldap/admin/src/scripts/DSMigration.pm \
+ ldap/admin/src/scripts/FileConn.pm
property_DATA = ldap/admin/src/scripts/setup-ds.res \
ldap/admin/src/scripts/migrate-ds.res
From fedora-directory-commits at redhat.com Wed Jul 4 01:28:20 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 3 Jul 2007 21:28:20 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
FileConn.pm, NONE, 1.1 DSMigration.pm.in, 1.1, 1.2 Resource.pm,
1.3, 1.4 Util.pm.in, 1.4, 1.5 setup-ds.pl.in, 1.3,
1.4 setup-ds.res.in, 1.5, 1.6
Message-ID: <200707040128.l641SKXK029070@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29013/ldapserver/ldap/admin/src/scripts
Modified Files:
DSMigration.pm.in Resource.pm Util.pm.in setup-ds.pl.in
setup-ds.res.in
Added Files:
FileConn.pm
Log Message:
Resolves: bug 246683
Bug Description: Reimplement ds_create without setuputil code
Reviewed by: nhosoi (Thanks!)
Fix Description: ds_create was a CGI program that would create a new instance, set it up to be managed by console, and register it with the config ds. The new ds_create CGI perl script does just that. One tricky part was that, rather than enabling the pass through auth plugin and having to restart the server, the new server is created without being started, then the modification is done to the new server dse.ldif file directly, using the new FileConn.pm module, which simulates a Mozilla::LDAP::Conn on an LDIF file. This also allows us to create a new instance with a pre-hashed rootdn password, rather than having to send the cleartext password.
I had to move around some code in AdminServer and AdminUtil so that I could use it from ds_create. I also implemented support for the admin server PASSWORD_PIPE in perl so we could use it in other CGI perl scripts.
Finally, the error handling was not consistent in our code, so I made explicit the passing of error messages up and down the stack. Oh how I wish we could just do this in python and use exception handling . . .
I added a test for ds_create.
Platforms tested: RHEL4
Flag Day: Yes - autotool changes
Doc impact: No. Should work the same way as the old ds_create.
--- NEW FILE FileConn.pm ---
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# FileConn is a subclass of Mozilla::LDAP::Conn. This class does
# not use LDAP. Instead, it operates on a given LDAP file, allowing
# you to search, add, modify, and delete entries in the file.
#
package FileConn;
use Mozilla::LDAP::Conn;
use Mozilla::LDAP::API qw(:constant ldap_explode_dn ldap_err2string); # Direct access to C API
use Mozilla::LDAP::Utils qw(normalizeDN);
use Mozilla::LDAP::LDIF;
require Exporter;
@ISA = qw(Exporter Mozilla::LDAP::Conn);
@EXPORT = qw();
@EXPORT_OK = qw();
sub new {
my $class = shift;
my $filename = shift;
my $self = {};
$self = bless $self, $class;
$self->read($filename);
return $self;
}
sub getParentDN {
my $dn = shift;
my @rdns = ldap_explode_dn($dn, 0);
shift @rdns;
return join(',', @rdns);
}
sub read {
my $self = shift;
my $filename = shift;
if ($filename) {
$self->{filename} = $filename;
} else {
$filename = $self->{filename};
}
if (!$self->{filename}) {
return;
}
open( MYLDIF, "$filename" ) || die "Can't open $filename: $!";
my $in = new Mozilla::LDAP::LDIF(*MYLDIF);
while ($ent = readOneEntry $in) {
if (!$self->add($ent)) {
die "Error: could not add entry ", $ent->getDN(), ":", $self->getErrorString();
}
}
close( MYLDIF );
}
# return all nodes below the given node
sub iterate {
my $self = shift;
my $dn = shift;
my $scope = shift;
my $callback = shift;
my $context = shift;
my $suppress = shift;
my $ndn = normalizeDN($dn);
my $children = $self->{$ndn}->{children};
if (($scope != LDAP_SCOPE_ONELEVEL) && $self->{$ndn}->{data} && !$suppress) {
&{$callback}($self->{$ndn}->{data}, $context);
}
if ($scope == LDAP_SCOPE_BASE) {
return;
}
for my $node (@{$children}) {
&{$callback}($node->{data}, $context);
}
if ($scope == LDAP_SCOPE_SUBTREE) {
for my $node (@{$children}) {
$self->iterate($node->{data}->getDN(), $scope, $callback, $context, 1);
}
}
}
sub writecb {
my $entry = shift;
my $fh = shift;
if (! $entry->getDN()) { # rootDSE requires special hack around perldap bug
my $ary = $entry->getLDIFrecords();
shift @$ary; # remove "dn"
shift @$ary; # remove the empty dn value
print $fh "dn:\n";
print $fh (Mozilla::LDAP::LDIF::pack_LDIF (78, $ary), "\n");
} else {
Mozilla::LDAP::LDIF::put_LDIF($fh, 78, $entry);
}
}
sub write {
my $self = shift;
my $filename = shift;
if ($filename) {
$self->{filename} = $filename;
} else {
$filename = $self->{filename};
}
if (!$self->{filename}) {
return;
}
open( MYLDIF, ">$filename" ) || die "Can't write $filename: $!";
$self->iterate("", LDAP_SCOPE_SUBTREE, \&writecb, \*MYLDIF);
close( MYLDIF );
}
sub setErrorCode {
my $self = shift;
$self->{lastErrorCode} = shift;
}
sub getErrorCode {
my $self = shift;
return $self->{lastErrorCode};
}
sub getErrorString {
my $self = shift;
return ($self->{lastErrorCode} ? ldap_err2string($self->{lastErrorCode}) : LDAP_SUCCESS);
}
#############################################################################
# Print the last error code...
#
sub printError
{
my ($self, $str) = @_;
$str = "LDAP error:" unless defined($str);
print "$str ", $self->getErrorString(), "\n";
}
sub close {
my $self = shift;
$self->write();
}
sub printcb {
my $entry = shift;
print $entry->getDN(), "\n";
}
sub print {
my $self = shift;
my $dn = shift;
my $scope = shift;
$self->iterate($dn, $scope, \&printcb);
}
# for each entry, call the user provided filter callback
# with the entry and the user provided filter context
# if the filtercb returns true, add the entry to the
# list of entries to return
sub searchcb {
my $entry = shift;
my $context = shift;
my $self = $context->[0];
my $filtercb = $context->[1];
my $filtercontext = $context->[2];
if (&{$filtercb}($entry, $filtercontext)) {
push @{$self->{entries}}, $entry;
}
}
sub matchall {
return 1;
}
sub matchAttrVal {
my $entry = shift;
my $context = shift;
my $attr = $context->[0];
my $val = $context->[1];
if ($val eq "*") {
return $entry->exists($attr);
}
return $entry->hasValue($attr, $val, 1);
}
my $attrpat = '[-;.:\w]*[-;\w]';
# given a string filter, figure out which subroutine to
# use to match
sub filterToMatchSub {
my $self = shift;
my ($basedn, $scope, $filter, $attrsonly, @rest) = @_;
my ($matchsub, $context);
# do some filter processing
if (!$filter or ($filter eq "(objectclass=*)") or
($filter eq "objectclass=*")) {
$matchsub = \&matchall;
} elsif ($filter =~ /^\(($attrpat)=(.+)\)$/o) {
push @{$context}, $1, $2;
$matchsub = \&matchAttrVal;
# } elsif ($filter =~ /^\(\|\(($attrpat)=(.+)\)\(($attrpat)=(.+)\)\)$/o) {
# $attr = $1;
# $val = $2;
# $attr1 = $1;
# $val1 = $2;
# $isand = 0;
# } elsif ($filter =~ /^\(\&\(($attrpat)=(.+)\)\(($attrpat)=(.+)\)\)$/o) {
# $attr = $1;
# $val = $2;
# $attr1 = $1;
# $val1 = $2;
# $isand = 1;
# } elsif ($filter =~ /^\(\|\(($attrpat)=(.+)\)\(($attrpat)=(.+)\)\)$/o) {) {
# # "(&(objectclass=nsBackendInstance)(|(nsslapd-suffix=$suffix)(nsslapd-suffix=$nsuffix)))");
}
$self->iterate($basedn, $scope, \&searchcb, [$self, $matchsub, $context]);
}
# simple searches only
sub search {
my $self = shift;
my ($basedn, $scope, $filter, $attrsonly, @rest) = @_;
my $attrs;
if (ref($rest[0]) eq "ARRAY") {
$attrs = $rest[0];
} elsif (scalar(@rest) > 0) {
$attrs = \@rest;
}
$scope = Mozilla::LDAP::Utils::str2Scope($scope);
$self->{entries} = [];
my $ndn = normalizeDN($basedn);
if (!exists($self->{$ndn})) {
$self->setErrorCode(LDAP_NO_SUCH_OBJECT);
return undef;
}
$self->setErrorCode(0);
if (ref($filter) eq 'CODE') {
$self->iterate($basedn, $scope, \&searchcb, [$self, $filter, $attrsonly]);
} else {
$self->filterToMatchSub($basedn, $scope, $filter, $attrsonly);
}
return $self->nextEntry();
}
sub nextEntry {
my $self = shift;
return shift @{$self->{entries}};
}
sub add {
my $self = shift;
my $entry = shift;
my $dn = $entry->getDN();
my $ndn = normalizeDN($dn);
my $parentdn = getParentDN($dn);
my $nparentdn = normalizeDN($parentdn);
$self->setErrorCode(0);
if (exists($self->{$ndn})) {
$self->setErrorCode(LDAP_ALREADY_EXISTS);
return 0;
}
if ($nparentdn && !exists($self->{$nparentdn})) {
$self->setErrorCode(LDAP_NO_SUCH_OBJECT);
return 0;
}
# each hash entry has two keys
# data is the actual Entry
# children is the array ref of the one level children of this dn
$self->{$ndn}->{data} = $entry;
push @{$self->{$nparentdn}->{children}}, $self->{$ndn};
return 1;
}
sub update {
my $self = shift;
my $entry = shift;
my $dn = $entry->getDN();
my $ndn = normalizeDN($dn);
$self->setErrorCode(0);
if (!exists($self->{$ndn})) {
$self->setErrorCode(LDAP_NO_SUCH_OBJECT);
return 0;
}
$self->{$ndn}->{data} = $entry;
return 1;
}
sub delete {
my $self = shift;
my $dn = shift;
if (ref($dn)) {
$dn = $dn->getDN(); # an Entry
}
my $ndn = normalizeDN($dn);
$self->setErrorCode(0);
if (!exists($self->{$ndn})) {
$self->setErrorCode(LDAP_NO_SUCH_OBJECT);
return 0;
}
if (@{$self->{$ndn}->{children}}) {
$self->setErrorCode(LDAP_NOT_ALLOWED_ON_NONLEAF);
return 0;
}
# delete the data associated with this node
delete $self->{$ndn}->{data};
delete $self->{$ndn}->{children};
my $parentdn = getParentDN($dn);
my $nparentdn = normalizeDN($parentdn);
# delete this node from its parent
for (my $ii = 0; $ii < @{$self->{$nparentdn}->{children}}; ++$ii) {
# find matching hash ref in parent's child list
if ($self->{$nparentdn}->{children}->[$ii] eq $self->{$ndn}) {
# remove that element from the array
splice @{$self->{$nparentdn}->{children}}, $ii, 1;
# done - should only ever be one matching child
last;
}
}
# delete this node
delete $self->{$ndn};
return 0;
}
1;
Index: DSMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSMigration.pm.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DSMigration.pm.in 29 Jun 2007 21:12:21 -0000 1.1
+++ DSMigration.pm.in 4 Jul 2007 01:28:17 -0000 1.2
@@ -374,6 +374,7 @@
my $mig = shift;
$pkgname = $mig->{pkgname}; # set globals
$oldsroot = $mig->{oldsroot}; # set globals
+ my @errs;
# for each instance
foreach my $inst (@{$mig->{instances}}) {
@@ -388,13 +389,18 @@
# extract the information needed for ds_newinst.pl
my $configdir = "$oldsroot/$inst/config";
- my $inf = createInfFromConfig($configdir, $inst);
+ my $inf = createInfFromConfig($configdir, $inst, \@errs);
debug(2, "Using inffile $inf->{filename} created from $configdir\n");
+ if (@errs) {
+ $mig->msg(@errs);
+ return 0;
+ }
# create the new instance
- my ($rc, $output) = createDSInstance($inf);
+ my ($rc, $output) = createDSInstance($inf, \@errs);
unlink($inf->{filename});
if ($rc) {
+ $mig->msg(@errs);
$mig->msg($FATAL, 'error_creating_dsinstance', $rc, $output);
return 0;
} else {
Index: Resource.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Resource.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Resource.pm 15 Jun 2007 22:11:15 -0000 1.3
+++ Resource.pm 4 Jul 2007 01:28:17 -0000 1.4
@@ -112,7 +112,9 @@
}
}
# replace \n with real newline
- $self->{res}->{$curkey} =~ s/\\n/\n/g;
+ if (defined($curkey)) {
+ $self->{res}->{$curkey} =~ s/\\n/\n/g;
+ }
close RES;
}
}
Index: Util.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Util.pm.in 29 Jun 2007 21:12:21 -0000 1.4
+++ Util.pm.in 4 Jul 2007 01:28:17 -0000 1.5
@@ -119,8 +119,7 @@
$conn->delete($dn);
my $rc = $conn->getErrorCode();
if ( $rc != 0 ) {
- $conn->printError();
- print "ERROR: unable to delete entry $dn, error code: $rc\n";
+ debug(1, "ERROR: unable to delete entry $dn, error code: $rc:" . $conn->getErrorString() . "\n");
return 1;
}
$dn = pop @mystack;
@@ -220,7 +219,7 @@
# $verbose prints out more info
sub check_and_add_entry
{
- my ($context, $aentry) = @_;
+ my ($context, $aentry, $errs) = @_;
my $conn = $context->[0];
my $fresh = $context->[1];
my $verbose = $context->[2];
@@ -277,6 +276,7 @@
$rc = delete_all($conn, $sentry);
if ( 0 != $rc )
{
+ push @{$errs}, 'error_deleteall_entries', $sentry->{dn}, $conn->getErrorString();
debug(1, "Error deleting $sentry->{dn}\n");
return 0;
}
@@ -305,8 +305,8 @@
if ( $rc != 0 )
{
my $string = $conn->getErrorString();
- print "ERROR: adding an entry $aentry->{dn} failed, error: $string\n";
- print "[entry]\n";
+ push @{$errs}, 'error_adding_entry', $aentry->{dn}, $string;
+ debug(1, "ERROR: adding an entry $aentry->{dn} failed, error: $string\n");
$aentry->printLDIF();
$conn->close();
return 0;
@@ -359,8 +359,8 @@
if ( $rc != 0 )
{
my $string = $conn->getErrorString();
- print "ERROR: updating an entry $sentry->{dn} failed, error: $string\n";
- print "[entry]\n";
+ push @{$errs}, 'error_updating_entry', $sentry->{dn}, $string;
+ debug(1, "ERROR: updating an entry $sentry->{dn} failed, error: $string\n");
$aentry->printLDIF();
$conn->close();
return 0;
@@ -396,12 +396,14 @@
# and the values are the replacements
# ldiffiles - an array ref - the list of LDIF files to
# operate on
+# errs - an array ref - this is filled in with the
+# errors encountered in processing - this is
+# suitable for passing to setup->msg or
+# Resource->getText
# callback (optional) - a code ref - a ref to a subroutine
# that will be called with each entry - see below
# context (optional) - this will be passed as the first
# argument to your given callback - see below
-# errs (optional) - an array ref - This is how errors
-# are returned to the caller - see below
# Callback:
# The callback sub will be called for each entry after
# the entry has been converted. The callback will be
@@ -413,18 +415,20 @@
# abort processing of any further.
# Errors:
# This function should return an array of errors in the
-# format described below, for use with Resource::getText().
-# If the callback returns any errors
+# format described below, for use with Resource::getText()
+# or Setup::msg()
# Return:
# The return value is a list of entries.
# Example usage:
# sub handle_entries {
# my $context = shift;
# my $entry = shift;
+# my $errs = shift;
# .... do something with entry ....
# .... if $context is Mozilla::LDAP::Conn, $conn->add($entry); ...
# .... report errors ....
# if ($fatalerror) {
+# push @{$errs}, 'error_token', arg1, arg2, ...;
# return 0;
# } else {
# return 1;
@@ -433,14 +437,16 @@
# $mapper = {foo => 'bar', baz => 'biff'};
# @ldiffiles = ('foo.ldif', 'bar.ldif', ..., 'biff.ldif');
# $conn = new Mozilla::LDAP::Conn(...);
-# @entries = getMappedEntries($mapper, \@ldiffiles, \&handle_entries, $conn);
+# my @errs;
+# @entries = getMappedEntries($mapper, \@ldiffiles, \@errs, \&handle_entries, $conn);
# Note that this will return 0 entries since a callback was used.
# The simpler example is this:
-# @entries = getMappedEntries($mapper, \@ldiffiles);
+# @entries = getMappedEntries($mapper, \@ldiffiles, \@errs);
#
sub getMappedEntries {
my $mapper = shift;
my $ldiffiles = shift;
+ my $errs = shift;
my $callback = shift || \&cbaddent; # default - just add entry to @entries
my @entries = ();
my $context = shift || \@entries;
@@ -451,7 +457,10 @@
}
foreach my $ldiffile (@{$ldiffiles}) {
- open(MYLDIF, "< $ldiffile") or die "Can't open $ldiffile : $!";
+ if (!open(MYLDIF, "< $ldiffile")) {
+ push @{$errs}, "error_opening_ldiftmpl", $ldiffile, $!;
+ return 0;
+ }
my $in = new Mozilla::LDAP::LDIF(*MYLDIF);
debug(1, "Processing $ldiffile ...\n");
ENTRY: while (my $entry = Mozilla::LDAP::LDIF::readOneEntry($in)) {
@@ -462,9 +471,7 @@
if (exists($mapper->{$1})) {
$dn =~ s{%([\w_-]+)%}{$mapper->{$1}}ge;
} else {
- print "ERROR: \"$origdn\" mapped to \"$dn\".\n";
- print "The LDIF file $ldiffile contains a token $1 for which there is no mapper.\n";
- print "Please check $ldiffile and your mapper to make sure all tokens are handled correctly.\n";
+ push @{$errs}, 'error_mapping_token_ldiftmpl', $dn, $ldiffile, $1;
$error = 1;
last ENTRY;
}
@@ -480,9 +487,8 @@
if (exists($mapper->{$1})) {
$value =~ s{%([\w_-]+)%}{$mapper->{$1}}ge;
} else {
- print "ERROR: \"$origvalue\" mapped to \"$value\".\n";
- print "The LDIF file $ldiffile contains a token $1 for which there is no mapper.\n";
- print "Please check $ldiffile and your mapper to make sure all tokens are handled correctly.\n";
+ push @{$errs}, 'error_mapping_token_ldiftmpl', $dn, $ldiffile, $1;
+ debug(1, "ERROR: \"$origvalue\" mapped to \"$value\".\n");
$error = 1;
last ENTRY;
}
@@ -492,9 +498,9 @@
$entry->setValues( $attr, @newvalues );
}
- if (!&{$callback}($context, $entry)) {
- print "There was an error processing entry ", $entry->getDN(), "\n";
- print "Cannot continue processing entries.\n";
+ if (!&{$callback}($context, $entry, $errs)) {
+ debug(1, "ERROR: There was an error processing entry ". $entry->getDN(). "\n");
+ debug(1, "Cannot continue processing entries.\n");
$error = 1;
last ENTRY;
}
@@ -640,7 +646,7 @@
# The %token% tokens are replaced in getMappedEntries
sub process_maptbl
{
- my ($mapper, @infdata) = @_;
+ my ($mapper, $errs, @infdata) = @_;
if (defined($mapper->{""})) {
$mapper = $mapper->{""}; # side effect of Inf with no sections
@@ -680,7 +686,7 @@
}
if (!defined($infsection->{$value}))
{
- print "ERROR: $value not found in the .inf files\n";
+ push @{$errs}, 'no_mapvalue_for_key', $value, $key;
return {};
}
}
@@ -709,6 +715,7 @@
sub createDSInstance {
my $inf = shift;
+ my $errs = shift; # unused for now
# find ds_newinst.pl - in same directory as this script or in PATH
my $ds_newinst;
($ds_newinst = $0) =~ s|/[^/]+$|/ds_newinst.pl|;
@@ -724,13 +731,18 @@
}
# this creates an Inf suitable for passing to createDSInstance
+# except that it has a bogus suffix
sub createInfFromConfig {
my $configdir = shift;
my $inst = shift;
+ my $errs = shift;
my $fname = "$configdir/dse.ldif";
my $id;
($id = $inst) =~ s/^slapd-//;
- open( DSELDIF, "$fname" ) || die "Can't open $fname: $!";
+ if (!open( DSELDIF, "$fname" )) {
+ push @{$errs}, "error_opening_dseldif", $fname, $!;
+ return 0;
+ }
my ($outfh, $inffile) = tempfile(SUFFIX => '.inf');
my $in = new Mozilla::LDAP::LDIF(*DSELDIF) ;
while (my $ent = readOneEntry $in) {
Index: setup-ds.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.pl.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- setup-ds.pl.in 29 Jun 2007 21:12:21 -0000 1.3
+++ setup-ds.pl.in 4 Jul 2007 01:28:17 -0000 1.4
@@ -69,8 +69,10 @@
$setup->{inf}->write();
}
-my ($rc, $output) = createDSInstance($setup->{inf});
+my @errs;
+my ($rc, $output) = createDSInstance($setup->{inf}, \@errs);
if ($rc) {
+ $setup->msg(@errs);
$setup->msg($FATAL, 'error_creating_dsinstance', $rc, $output);
} else {
$setup->msg('created_dsinstance', $output);
Index: setup-ds.res.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.res.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- setup-ds.res.in 29 Jun 2007 21:12:21 -0000 1.5
+++ setup-ds.res.in 4 Jul 2007 01:28:17 -0000 1.6
@@ -89,3 +89,9 @@
setup_exiting = Exiting . . .\nLog file is '%s'\n\n
error_creating_dsinstance = Error: Could not create directory server instance. Error code %s. Output:\n%s\n
created_dsinstance = Your new DS instance was successfully created. Output:\n%s\n
+no_mapvalue_for_key = The map value '%s' for key '%s' did not map to a value in any of the given information files.\n
+error_opening_ldiftmpl = Could not open the LDIF template file '%s'. Error: %s\n
+error_mapping_token_ldiftmpl = The entry '%s' in LDIF file '%s' contains a token '%s' for which there is no mapper.\nPlease check the file and your mapper to make sure all tokens are handled correctly.\n
+error_deleteall_entries = Error deleting entry '%s' and all children. Error: %s\n
+error_adding_entry = Error adding entry '%s'. Error: %s\n
+error_updating_entry = Error updating entry '%s'. Error: %s\n
From fedora-directory-commits at redhat.com Wed Jul 4 01:31:35 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 3 Jul 2007 21:31:35 -0400
Subject: [Fedora-directory-commits] adminserver Makefile.am, 1.21,
1.22 aclocal.m4, 1.16, 1.17 configure, 1.19, 1.20 missing,
1.10, 1.11 install-sh, 1.10, 1.11 compile, 1.9,
1.10 Makefile.in, 1.21, 1.22 depcomp, 1.10, 1.11 config.sub,
1.10, 1.11 config.guess, 1.10, 1.11
Message-ID: <200707040131.l641VZsV031036@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30934/adminserver
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh compile
Makefile.in depcomp config.sub config.guess
Log Message:
Resolves: bug 246683
Bug Description: Reimplement ds_create without setuputil code
Reviewed by: nhosoi (Thanks!)
Fix Description: ds_create was a CGI program that would create a new instance, set it up to be managed by console, and register it with the config ds. The new ds_create CGI perl script does just that. One tricky part was that, rather than enabling the pass through auth plugin and having to restart the server, the new server is created without being started, then the modification is done to the new server dse.ldif file directly, using the new FileConn.pm module, which simulates a Mozilla::LDAP::Conn on an LDIF file. This also allows us to create a new instance with a pre-hashed rootdn password, rather than having to send the cleartext password.
I had to move around some code in AdminServer and AdminUtil so that I could use it from ds_create. I also implemented support for the admin server PASSWORD_PIPE in perl so we could use it in other CGI perl scripts.
Finally, the error handling was not consistent in our code, so I made explicit the passing of error messages up and down the stack. Oh how I wish we could just do this in python and use exception handling . . .
I added a test for ds_create.
Platforms tested: RHEL4
Flag Day: Yes - autotool changes
Doc impact: No. Should work the same way as the old ds_create.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.am 29 Jun 2007 21:29:06 -0000 1.21
+++ Makefile.am 4 Jul 2007 01:31:32 -0000 1.22
@@ -161,7 +161,7 @@
ds_db2bak ds_listdb ds_rmdb ds_remove ds_snmpctrl ds_vlvindex ds_addindex
bin_SCRIPTS = admserv/newinst/src/register_server.pl
-cgibin_SCRIPTS = admserv/cgi-src40/Cgi.pm
+cgibin_SCRIPTS = admserv/cgi-src40/ds_create
nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \
@@ -373,7 +373,8 @@
nodist_property_DATA = $(RESOURCE_BUNDLES_ROOT)
# regular property files go here
property_DATA = admserv/newinst/src/setup-ds-admin.res \
- admserv/newinst/src/migrate-ds-admin.res
+ admserv/newinst/src/migrate-ds-admin.res \
+ admserv/cgi-src40/ds_create.res
# French resource bundles (for the French localization in the future)
#RESOURCE_BUNDLES_FR = foo_fr.res
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.in 29 Jun 2007 21:29:06 -0000 1.21
+++ Makefile.in 4 Jul 2007 01:31:32 -0000 1.22
@@ -595,7 +595,7 @@
admserv/newinst/src/asmigrate.map
bin_SCRIPTS = admserv/newinst/src/register_server.pl
-cgibin_SCRIPTS = admserv/cgi-src40/Cgi.pm
+cgibin_SCRIPTS = admserv/cgi-src40/ds_create
nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \
admserv/newinst/src/migrate-ds-admin.pl
@@ -784,7 +784,8 @@
nodist_property_DATA = $(RESOURCE_BUNDLES_ROOT)
# regular property files go here
property_DATA = admserv/newinst/src/setup-ds-admin.res \
- admserv/newinst/src/migrate-ds-admin.res
+ admserv/newinst/src/migrate-ds-admin.res \
+ admserv/cgi-src40/ds_create.res
# these are for the config files and scripts that we need to generate and replace
From fedora-directory-commits at redhat.com Wed Jul 4 01:31:35 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 3 Jul 2007 21:31:35 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40
ds_create.in, NONE, 1.1 ds_create.res, NONE, 1.1 Cgi.pm,
1.1.1.1, NONE Makefile, 1.13, NONE
Message-ID: <200707040131.l641VZLs031043@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30934/adminserver/admserv/cgi-src40
Added Files:
ds_create.in ds_create.res
Removed Files:
Cgi.pm Makefile
Log Message:
Resolves: bug 246683
Bug Description: Reimplement ds_create without setuputil code
Reviewed by: nhosoi (Thanks!)
Fix Description: ds_create was a CGI program that would create a new instance, set it up to be managed by console, and register it with the config ds. The new ds_create CGI perl script does just that. One tricky part was that, rather than enabling the pass through auth plugin and having to restart the server, the new server is created without being started, then the modification is done to the new server dse.ldif file directly, using the new FileConn.pm module, which simulates a Mozilla::LDAP::Conn on an LDIF file. This also allows us to create a new instance with a pre-hashed rootdn password, rather than having to send the cleartext password.
I had to move around some code in AdminServer and AdminUtil so that I could use it from ds_create. I also implemented support for the admin server PASSWORD_PIPE in perl so we could use it in other CGI perl scripts.
Finally, the error handling was not consistent in our code, so I made explicit the passing of error messages up and down the stack. Oh how I wish we could just do this in python and use exception handling . . .
I added a test for ds_create.
Platforms tested: RHEL4
Flag Day: Yes - autotool changes
Doc impact: No. Should work the same way as the old ds_create.
--- NEW FILE ds_create.in ---
#!/usr/bin/env perl
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
use lib '@perldir@';
use strict;
use CGI qw(:cgi :oldstyle_urls);
use Inf;
use AdminUtil;
use Util;
use Resource;
my $res = new Resource("@propertydir@/ds_create.res",
"@propertydir@/setup-ds-admin.res",
"@propertydir@/setup-ds.res");
# parse the input parameters
my $query = new CGI;
# look at arguments
# save old start_server param
# set start_server=0
my $start_server = $query->param('start_server');
$query->param('start_server', '0'); # create server but do not start
# call ds_newinst as a GET (GET or POST works, GET is simpler)
$ENV{REQUEST_METHOD} = "GET";
$ENV{QUERY_STRING} = $query->query_string();
# make sure the child exit code is reset before starting the fake
# cgi program
my $prog = "@bindir@/ds_newinst";
if (! -x $prog) {
$prog = "@dslibdir@/ds_newinst";
}
$? = 0;
# run the CGI
my $output = `$prog 2>&1`;
my $status = $?;
# check for and report errors
if ($status) {
print $output;
exit $status;
}
# set up new DS to be managed by config DS - acis, pta config
# new ds info, needed for registration (or get from new dse.ldif)
# temp = ds_a_get_cgi_var("servport", NULL, NULL);
# if (!(cf->servid = ds_a_get_cgi_var("servid", "Server Identifier",
# "Please give your server a short identifier.")))
# cf->rootdn = dn_normalize_convert(ds_a_get_cgi_var("rootdn", NULL, NULL));
# if (!(cf->rootpw = ds_a_get_cgi_var("rootpw", NULL, NULL)))
# cf->start_server = ds_a_get_cgi_var("start_server", NULL, NULL);
my $inst = $query->param('servid');
my @errs;
my $inf = createInfFromConfig("@instconfigdir@/slapd-$inst", $inst, \@errs);
if (@errs) {
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
exit 1;
}
# add the parmeters necessary to configure this DS to be managed
# by the console and to be registered with the config DS - these
# are usually passed in via the CGI params, or use reasonable
# default values
my $admConf = getAdmConf("@instconfigdir@/admin-serv");
$inf->{General}->{ConfigDirectoryLdapURL} = $query->param('ldap_url') ||
$admConf->{ldapurl};
$inf->{General}->{ConfigDirectoryAdminID} = $query->param('cfg_sspt_uid');
$inf->{General}->{ConfigDirectoryAdminPwd} = $query->param('cfg_sspt_uid_pw');
$inf->{General}->{AdminDomain} = $query->param('admin_domain') ||
$admConf->{AdminDomain};
if (!createSubDSNoConn($inf, \@errs)) {
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
exit 1;
}
my $servid = $query->param('servid');
if ($start_server) {
# ok to use here because not only will ds_newinst have validated that
# servid contains only good characters, but we test for the existence
# of this file first
$prog = "@dslibdir@/slapd-$servid/start-slapd";
if (-x $prog) {
$? = 0;
# run the CGI
my $output = `$prog 2>&1`;
my $status = $?;
if ($status) {
print "NMC_ErrInfo: Could not start directory server: $output\n";
print "NMC_Status: $status\n";
exit $status;
}
} else {
print "NMC_ErrInfo: The program $prog does not exist\n";
print "NMC_Status: 1\n";
exit 1;
}
}
# register the new server with the configuration ds
# get config ds url from input or admconf
# get admin id from input or admconf
# must get admin password from input (PASSWORD_PIPE?)
# get admin domain
# config ds info
if (!registerDSWithConfigDS($servid, \@errs, $inf)) {
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
exit 1;
}
# if we got here, report success
print "NMC_Status: 0\n";
exit 0;
--- NEW FILE ds_create.res ---
# resources for ds_create
--- Cgi.pm DELETED ---
--- Makefile DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 4 01:31:35 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 3 Jul 2007 21:31:35 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/schema/ldif
11dstasks.ldif.tmpl, 1.3, 1.4 15dspta.ldif.tmpl.in, 1.1, 1.2
Message-ID: <200707040131.l641VZGW031061@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30934/adminserver/admserv/schema/ldif
Modified Files:
11dstasks.ldif.tmpl 15dspta.ldif.tmpl.in
Log Message:
Resolves: bug 246683
Bug Description: Reimplement ds_create without setuputil code
Reviewed by: nhosoi (Thanks!)
Fix Description: ds_create was a CGI program that would create a new instance, set it up to be managed by console, and register it with the config ds. The new ds_create CGI perl script does just that. One tricky part was that, rather than enabling the pass through auth plugin and having to restart the server, the new server is created without being started, then the modification is done to the new server dse.ldif file directly, using the new FileConn.pm module, which simulates a Mozilla::LDAP::Conn on an LDIF file. This also allows us to create a new instance with a pre-hashed rootdn password, rather than having to send the cleartext password.
I had to move around some code in AdminServer and AdminUtil so that I could use it from ds_create. I also implemented support for the admin server PASSWORD_PIPE in perl so we could use it in other CGI perl scripts.
Finally, the error handling was not consistent in our code, so I made explicit the passing of error messages up and down the stack. Oh how I wish we could just do this in python and use exception handling . . .
I added a test for ds_create.
Platforms tested: RHEL4
Flag Day: Yes - autotool changes
Doc impact: No. Should work the same way as the old ds_create.
Index: 11dstasks.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/11dstasks.ldif.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 11dstasks.ldif.tmpl 27 Jun 2007 22:25:00 -0000 1.3
+++ 11dstasks.ldif.tmpl 4 Jul 2007 01:31:33 -0000 1.4
@@ -180,7 +180,7 @@
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
-nsExecRef: ds_newinst
+nsExecRef: ds_create
cn: Create
dn: cn=GetConfigInfo, cn=Operation, cn=Tasks, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
Index: 15dspta.ldif.tmpl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/15dspta.ldif.tmpl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 15dspta.ldif.tmpl.in 28 Jun 2007 18:41:29 -0000 1.1
+++ 15dspta.ldif.tmpl.in 4 Jul 2007 01:31:33 -0000 1.2
@@ -22,11 +22,11 @@
objectClass: nsSlapdPlugin
objectClass: extensibleObject
cn: Pass Through Authentication
-nsslapd-pluginPath: @dslibdir@/plugins/libpassthru-plugin.so
+nsslapd-pluginPath: libpassthru-plugin
nsslapd-pluginInitfunc: passthruauth_init
nsslapd-pluginType: preoperation
nsslapd-pluginEnabled: on
-nsslapd-pluginarg0: %config_ds_url%/o%3DNetscapeRoot
+nsslapd-pluginarg0: %config_ds_url%
nsslapd-plugin-depends-on-type: database
nsslapd-pluginId: passthruauth
nsslapd-pluginVersion: %ds_version%
From fedora-directory-commits at redhat.com Wed Jul 4 01:31:35 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 3 Jul 2007 21:31:35 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
AdminMigration.pm.in, 1.1, 1.2 AdminServer.pm.in, 1.4,
1.5 AdminUtil.pm.in, 1.7, 1.8 migrate-ds-admin.pl.in, 1.1,
1.2 register_server.pl.in, 1.3, 1.4 setup-ds-admin.pl.in, 1.6, 1.7
Message-ID: <200707040131.l641VZlG031051@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30934/adminserver/admserv/newinst/src
Modified Files:
AdminMigration.pm.in AdminServer.pm.in AdminUtil.pm.in
migrate-ds-admin.pl.in register_server.pl.in
setup-ds-admin.pl.in
Log Message:
Resolves: bug 246683
Bug Description: Reimplement ds_create without setuputil code
Reviewed by: nhosoi (Thanks!)
Fix Description: ds_create was a CGI program that would create a new instance, set it up to be managed by console, and register it with the config ds. The new ds_create CGI perl script does just that. One tricky part was that, rather than enabling the pass through auth plugin and having to restart the server, the new server is created without being started, then the modification is done to the new server dse.ldif file directly, using the new FileConn.pm module, which simulates a Mozilla::LDAP::Conn on an LDIF file. This also allows us to create a new instance with a pre-hashed rootdn password, rather than having to send the cleartext password.
I had to move around some code in AdminServer and AdminUtil so that I could use it from ds_create. I also implemented support for the admin server PASSWORD_PIPE in perl so we could use it in other CGI perl scripts.
Finally, the error handling was not consistent in our code, so I made explicit the passing of error messages up and down the stack. Oh how I wish we could just do this in python and use exception handling . . .
I added a test for ds_create.
Platforms tested: RHEL4
Flag Day: Yes - autotool changes
Doc impact: No. Should work the same way as the old ds_create.
Index: AdminMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminMigration.pm.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AdminMigration.pm.in 29 Jun 2007 21:29:05 -0000 1.1
+++ AdminMigration.pm.in 4 Jul 2007 01:31:33 -0000 1.2
@@ -160,7 +160,7 @@
# This is how we extract the sie and isie as the as entries are
# being added
sub migratecb {
- my ($context, $entry) = @_;
+ my ($context, $entry, $errs) = @_;
my @arycontext = ($context);
# always replace the tasks and commands with the new ones
@@ -170,7 +170,7 @@
push @arycontext, 1; # means to delete any existing entries first
}
- my $rc = check_and_add_entry(\@arycontext, $entry);
+ my $rc = check_and_add_entry(\@arycontext, $entry, $errs);
return $rc;
}
@@ -207,21 +207,29 @@
my $mapper = new Inf("@infdir@/asmigrate.map");
- $mapper = process_maptbl($mapper, ($inf, $admininf, $setupinf));
+ $mapper = process_maptbl($mapper, \@errs, $inf, $admininf, $setupinf);
if (!$mapper) {
$conn->close();
+ $mig->msg(@errs);
$mig->msg($FATAL, 'error_creating_asmigration_maptbl');
return 0;
}
# update isie and sie
- getMappedEntries($mapper, \@ldiffiles, \&migratecb, $conn);
+ getMappedEntries($mapper, \@ldiffiles, \@errs, \&migratecb, $conn);
+ if (@errs) {
+ $conn->close();
+ $mig->msg(@errs);
+ return 0;
+ }
+
my $localconf = "$configdir/local.conf";
my $isnew;
if (! -f $localconf) {
$isnew = 1;
}
if (!open(LOCALCONF, ">$localconf")) {
+ $conn->close();
$mig->msg($FATAL, 'error_updating_localconf', $localconf, $!);
return 0;
}
Index: AdminServer.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminServer.pm.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AdminServer.pm.in 29 Jun 2007 21:29:05 -0000 1.4
+++ AdminServer.pm.in 4 Jul 2007 01:31:33 -0000 1.5
@@ -39,12 +39,12 @@
package AdminServer;
require Exporter;
@ISA = qw(Exporter);
- at EXPORT = qw(createAdminServer reconfigAdminServer registerDSWithConfigDS
+ at EXPORT = qw(createAdminServer reconfigAdminServer
createASFilesAndDirs setFileOwnerPerms updateHttpConfFiles
- startAdminServer registerManyDSWithConfigDS);
- at EXPORT_OK = qw(createAdminServer reconfigAdminServer registerDSWithConfigDS
+ startAdminServer);
+ at EXPORT_OK = qw(createAdminServer reconfigAdminServer
createASFilesAndDirs setFileOwnerPerms updateHttpConfFiles
- startAdminServer registerManyDSWithConfigDS);
+ startAdminServer);
use File::Path;
# tempfiles
@@ -206,9 +206,9 @@
# This is how we extract the sie and isie as the as entries are
# being added
sub registercb {
- my ($context, $entry) = @_;
+ my ($context, $entry, $errs) = @_;
- my $rc = check_and_add_entry([$context->{conn}], $entry);
+ my $rc = check_and_add_entry([$context->{conn}], $entry, $errs);
my $setup = $context->{setup};
if ($rc) {
if ($entry->hasValue('objectclass', 'nsApplication', 1)) {
@@ -224,6 +224,7 @@
}
}
} else {
+ $setup->msg(@{$errs});
$setup->msg($FATAL, 'error_adding_adminserver_config_entry', $entry->getDN());
}
@@ -258,9 +259,10 @@
my $mapper = new Inf("@infdir@/adminserver.map");
- $mapper = process_maptbl($mapper, ($inf, $admininf, $setupinf));
- if (!$mapper) {
+ $mapper = process_maptbl($mapper, \@errs, $inf, $admininf, $setupinf);
+ if (!$mapper or @errs) {
$conn->close();
+ $setup->msg(@errs);
$setup->msg($FATAL, 'error_creating_adminserver_maptbl');
return 0;
}
@@ -276,7 +278,7 @@
return 0;
}
my $context = {conn => $conn, localfh => \*LOCALCONF, setup => $setup};
- getMappedEntries($mapper, \@ldiffiles, \®istercb, $context);
+ getMappedEntries($mapper, \@ldiffiles, \@errs, \®istercb, $context);
close(LOCALCONF);
if ($isnew) {
@@ -298,7 +300,7 @@
}
$conn->close();
- return 1;
+ return @errs ? 0 : 1;
}
# update other config files - these are the fields which users typically want to
@@ -451,98 +453,3 @@
my $setup = shift;
return createAdminServer($setup, 1);
}
-
-sub registerDSWithConfigDS {
- my $setup = shift;
- my $inf = shift || $setup->{inf};
- my $configdir = shift || "$setup->{configdir}/admin-serv";
- my @errs;
-
- $setup->msg('registering_dirserver');
- # open a connection to the configuration directory server
- my $conn;
- if (ref($configdir)) {
- $conn = $configdir;
- } else {
- $conn = getConfigDSConn($inf->{General}->{ConfigDirectoryLdapURL},
- $inf->{General}->{ConfigDirectoryAdminID},
- $inf->{General}->{ConfigDirectoryAdminPwd},
- $configdir, \@errs);
- }
-
- if (@errs) {
- $setup->msg($FATAL, @errs);
- return 0;
- }
-
- # add the Admin Server configuration entries
- my @ldiffiles = ("@ldifdir@/10dsdata.ldif.tmpl",
- "@ldifdir@/11dstasks.ldif.tmpl"
- );
- my $setupinf = new Inf("@infdir@/setup.inf");
- my $slapdinf = new Inf("@infdir@/slapd.inf");
-
- my $mapper = new Inf("@infdir@/dirserver.map");
-
- if (!$inf->{General}->{ConfigDirectoryLdapURL}) {
- $inf->{General}->{ConfigDirectoryLdapURL} =
- $setup->{inf}->{General}->{ConfigDirectoryLdapURL};
- }
-
- $mapper = process_maptbl($mapper, ($inf, $slapdinf, $setupinf));
- if (!$mapper) {
- $conn->close();
- $setup->msg($FATAL, 'error_creating_dirserver_maptbl');
- return 0;
- }
-
- my $context = [$conn];
- getMappedEntries($mapper, \@ldiffiles, \&check_and_add_entry, $context);
-
- if (!ref($configdir)) {
- $conn->close();
- }
-
- return 1;
-}
-
-# this takes a list of DS instances and registers all of them
-# with the config DS
-sub registerManyDSWithConfigDS {
- my $setup = shift;
- my $configdir = shift;
- my @instances = @_;
- my @errs;
- my $inf = $setup->{inf};
-
- if (!@instances) {
- return 1;
- }
-
- $setup->msg('registering_dirserver_instances');
- # open a connection to the configuration directory server
- my $conn = getConfigDSConn($inf->{General}->{ConfigDirectoryLdapURL},
- $inf->{General}->{ConfigDirectoryAdminID},
- $inf->{General}->{ConfigDirectoryAdminPwd},
- $configdir, \@errs);
-
- if (@errs) {
- $setup->msg($FATAL, @errs);
- return 0;
- }
-
- my $admConf = getAdmConf($configdir);
-
- for (@instances) {
- my $instinf = createInfFromConfig("$setup->{configdir}/$_", $_);
- $instinf->{General}->{AdminDomain} = $admConf->{AdminDomain};
- unlink($instinf->{filename});
- if (!registerDSWithConfigDS($setup, $instinf, $conn)) {
- return 0;
- }
- }
-
- $conn->close();
-
- return 0;
-}
Index: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AdminUtil.pm.in 29 Jun 2007 21:29:05 -0000 1.7
+++ AdminUtil.pm.in 4 Jul 2007 01:31:33 -0000 1.8
@@ -41,10 +41,12 @@
@ISA = qw(Exporter);
@EXPORT = qw(getAdmConf getConfigDSConn createConfigDS createSubDS
updateAdmConf updateAdmpw updateLocalConf importCACert
- getLocalConfigDS getPset);
+ getLocalConfigDS getPset registerDSWithConfigDS
+ registerManyDSWithConfigDS createSubDSNoConn);
@EXPORT_OK = qw(getAdmConf getConfigDSConn createConfigDS createSubDS
updateAdmConf updateAdmpw updateLocalConf importCACert
- getLocalConfigDS getPset);
+ getLocalConfigDS getPset registerDSWithConfigDS
+ registerManyDSWithConfigDS createSubDSNoConn);
# load perldap
use Mozilla::LDAP::Conn;
@@ -54,6 +56,7 @@
use Util;
use Inf;
+use FileConn;
use strict;
@@ -264,34 +267,27 @@
my $dsinf = new Inf("@infdir@/slapd.inf");
my $mapper = new Inf("@infdir@/configdsroot.map");
- $mapper = process_maptbl($mapper, ($inf, $dsinf, $admininf, $setupinf));
- if (!$mapper) {
+ $mapper = process_maptbl($mapper, $errs, $inf, $dsinf, $admininf, $setupinf);
+ if (!$mapper or @{$errs}) {
$conn->close();
- @{$errs} = ('error_creating_configds_maptbl');
+ if (!@{$errs}) {
+ @{$errs} = ('error_creating_configds_maptbl');
+ }
return 0;
}
- getMappedEntries($mapper, \@ldiffiles, \&check_and_add_entry,
+ getMappedEntries($mapper, \@ldiffiles, $errs, \&check_and_add_entry,
[$conn]);
$conn->close();
- return 1;
+ return @{$errs} ? 0 : 1;
}
-# Take the slapd server instance specified in the slapd section of the given inf
-# and make it into a subordinative directory server
-# (no o=netscaperoot, with PTA setup)
-sub createSubDS {
+sub internalCreateSubDS {
+ my $conn = shift;
my $inf = shift;
my $errs = shift;
- # open a connection to the directory server
- my $conn = new Mozilla::LDAP::Conn($inf->{General}->{FullMachineName},
- $inf->{slapd}->{ServerPort},
- $inf->{slapd}->{RootDN},
- $inf->{slapd}->{RootDNPwd},
- $inf->{General}->{certdir});
-
# add the o=NetscapeRoot tree using the mapper and ldif templates
my @ldiffiles = ('@ldifdir@/12dsconfig.mod.tmpl',
'@ldifdir@/13dsschema.mod.tmpl',
@@ -303,18 +299,50 @@
my $dsinf = new Inf("@infdir@/slapd.inf");
my $mapper = new Inf("@infdir@/dirserver.map");
- $mapper = process_maptbl($mapper, ($inf, $dsinf, $admininf, $setupinf));
- if (!$mapper) {
+ $mapper = process_maptbl($mapper, $errs, $inf, $dsinf, $admininf, $setupinf);
+ if (!$mapper or @{$errs}) {
$conn->close();
- @{$errs} = ('error_creating_configds_maptbl');
+ if (!@{$errs}) {
+ @{$errs} = ('error_creating_configds_maptbl');
+ }
return 0;
}
- getMappedEntries($mapper, \@ldiffiles, \&check_and_add_entry,
+ getMappedEntries($mapper, \@ldiffiles, $errs, \&check_and_add_entry,
[$conn]);
$conn->close();
- return 1;
+ return @{$errs} ? 0 : 1;
+}
+
+# Take the slapd server instance specified in the slapd section of the given inf
+# and make it into a subordinative directory server
+# (no o=netscaperoot, with PTA setup)
+sub createSubDS {
+ my $inf = shift;
+ my $errs = shift;
+
+ # open a connection to the directory server
+ my $conn = new Mozilla::LDAP::Conn($inf->{General}->{FullMachineName},
+ $inf->{slapd}->{ServerPort},
+ $inf->{slapd}->{RootDN},
+ $inf->{slapd}->{RootDNPwd},
+ $inf->{General}->{certdir});
+
+ return internalCreateSubDS($conn, $inf, $errs);
+}
+
+# same as createSubDS but works directly on the dse.ldif file itself
+# this is suitable for use when creating a new DS instance on the local
+# machine,
+sub createSubDSNoConn {
+ my $inf = shift;
+ my $errs = shift;
+
+ my $dseldif = "@instconfigdir@/slapd-" . $inf->{slapd}->{ServerIdentifier} . "/dse.ldif";
+ my $conn = new FileConn($dseldif);
+
+ return internalCreateSubDS($conn, $inf, $errs);
}
sub updateAdmConf {
@@ -511,3 +539,173 @@
return $inst;
}
+
+# most admin server CGIs only use PASSWORD and USERDN
+sub getAuthCredentials {
+ if ($AdminUtil::USER) {
+ return ($AdminUtil::USER, $AdminUtil::PASSWORD,
+ $AdminUtil::AUTHORIZATION, $AdminUtil::USERDN,
+ $AdminUtil::SIEPWD);
+ }
+
+ if (!defined($ENV{PASSWORD_PIPE})) {
+ return ();
+ }
+
+ my $fh;
+ if (fileno(STDIN) == $ENV{PASSWORD_PIPE}) {
+ $fh = \*STDIN;
+ } else {
+ open(INPUT, "<&=$ENV{PASSWORD_PIPE}") or
+ die "Error: could not open PASSWORD_PIPE $ENV{PASSWORD_PIPE}: $!";
+ $fh = \*INPUT;
+ }
+ while (<$fh>) {
+ if (/^User: (.*)$/) {
+ $AdminUtil::USER = $1;
+ }
+ if (/^Password: (.*)$/) {
+ $AdminUtil::PASSWORD = $1;
+ }
+ if (/^Authorization: (.*)$/) {
+ $AdminUtil::AUTHORIZATION = $1;
+ }
+ if (/^UserDN: (.*)$/) {
+ $AdminUtil::USERDN = $1;
+ }
+ if (/^SIEPWD: (.*)$/) {
+ $AdminUtil::SIEPWD = $1;
+ }
+ }
+ if (fileno(STDIN) != $ENV{PASSWORD_PIPE}) {
+ close $fh;
+ }
+
+ return ($AdminUtil::USER, $AdminUtil::PASSWORD,
+ $AdminUtil::AUTHORIZATION, $AdminUtil::USERDN,
+ $AdminUtil::SIEPWD);
+}
+
+# this takes a list of DS instances and registers all of them
+# with the config DS
+sub registerManyDSWithConfigDS {
+ my $inf = shift;
+ my $errs = shift;
+ my $configdir = shift;
+ my @instances = @_;
+
+ if (!@instances) {
+ return 1; # no instances to register - just return ok
+ }
+
+ # open a connection to the configuration directory server
+ my $conn = getConfigDSConn($inf->{General}->{ConfigDirectoryLdapURL},
+ $inf->{General}->{ConfigDirectoryAdminID},
+ $inf->{General}->{ConfigDirectoryAdminPwd},
+ "$configdir/admin-serv", $errs);
+
+ if (!$conn or @{$errs}) {
+ return 0;
+ }
+
+ my $admConf = getAdmConf("$configdir/admin-serv");
+
+ for my $inst (@instances) {
+ my $instinf = createInfFromConfig("$configdir/$inst", $inst);
+ unlink($instinf->{filename});
+ $instinf->{General}->{ConfigDirectoryLdapURL} =
+ $inf->{General}->{ConfigDirectoryLdapURL};
+ if (!registerDSWithConfigDS($inst, $errs, $instinf,
+ $conn, $admConf, $configdir)) {
+ return 0;
+ }
+ }
+
+ $conn->close();
+
+ return 1
+}
+
+sub registerDSWithConfigDS {
+ my $servid = shift;
+ my $errs = shift;
+ my $inf = shift;
+ my $conn = shift;
+ my $admConf = shift;
+ my $configdir = shift || "@instconfigdir@";
+ my $inst;
+ my $needclose;
+
+ if ($servid =~ /^slapd-/) {
+ $inst = $servid;
+ } else {
+ $inst = "slapd-$servid";
+ }
+
+ my ($dummy1, $pwd, $dummy2, $userdn) = getAuthCredentials();
+
+ if (!$inf->{General}->{AdminDomain}) {
+ if (!$admConf) {
+ $admConf = getAdmConf("$configdir/admin-serv");
+ }
+ $inf->{General}->{AdminDomain} = $admConf->{AdminDomain};
+ }
+
+ # open a connection to the configuration directory server
+ if (!$conn) {
+ if (!$userdn) {
+ $userdn = $inf->{General}->{ConfigDirectoryAdminID};
+ }
+ if (!$pwd) {
+ $pwd = $inf->{General}->{ConfigDirectoryAdminPwd};
+ }
+
+ $conn = getConfigDSConn($inf->{General}->{ConfigDirectoryLdapURL},
+ $userdn, $pwd,
+ "$configdir/admin-serv", $errs);
+ $needclose = 1;
+ }
+
+ if (!$conn or @{$errs}) {
+ return 0;
+ }
+
+ my $instinf;
+ # setup will usually supply everything, but ds_create will not
+ if (!$inf->{slapd}->{RootDNPwd}) {
+ $instinf = createInfFromConfig("$configdir/$inst", $inst, $errs);
+ if (!$instinf or @{$errs}) {
+ if ($needclose) {
+ $conn->close();
+ }
+ return 0;
+ }
+ }
+
+ # add the Admin Server configuration entries
+ my @ldiffiles = ("@ldifdir@/10dsdata.ldif.tmpl",
+ "@ldifdir@/11dstasks.ldif.tmpl"
+ );
+ my $setupinf = new Inf("@infdir@/setup.inf");
+ my $slapdinf = new Inf("@infdir@/slapd.inf");
+
+ my $mapper = new Inf("@infdir@/dirserver.map");
+
+ $mapper = process_maptbl($mapper, $errs, $inf, $instinf, $slapdinf, $setupinf);
+ if (!$mapper or @{$errs}) {
+ if ($needclose) {
+ $conn->close();
+ }
+ return 0;
+ }
+
+ my $context = [$conn];
+ getMappedEntries($mapper, \@ldiffiles, $errs, \&check_and_add_entry, $context);
+
+ if ($needclose) {
+ $conn->close();
+ }
+
+ return @{$errs} ? 0 : 1;
+}
+
Index: migrate-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/migrate-ds-admin.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- migrate-ds-admin.pl.in 29 Jun 2007 21:29:05 -0000 1.1
+++ migrate-ds-admin.pl.in 4 Jul 2007 01:31:33 -0000 1.2
@@ -47,6 +47,7 @@
use Migration;
use Resource;
use DSMigration;
+use SetupLog;
my $res = new Resource("@propertydir@/migrate-ds-admin.res",
"@propertydir@/migrate-ds.res",
@@ -83,7 +84,14 @@
# next, register/update the new directory servers
# in the config ds
-registerManyDSWithConfigDS($mig, "$mig->{configdir}/admin-serv", @{$mig->{instances}});
+$mig->msg('registering_dirserver_instances');
+my @errs;
+if (!registerManyDSWithConfigDS($mig->{inf}, \@errs,
+ $mig->{configdir},
+ @{$mig->{instances}})) {
+ $mig->msg($FATAL, @errs);
+ exit 1;
+}
$mig->msg('end_dsadmin_migration');
Index: register_server.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_server.pl.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- register_server.pl.in 18 Jun 2007 17:14:51 -0000 1.3
+++ register_server.pl.in 4 Jul 2007 01:31:33 -0000 1.4
@@ -186,17 +186,20 @@
my $mapper = new Inf($mapfile);
my $infdatum = new Inf($thisinf);
push(@infdata, ($infdatum));
- $mapper = process_maptbl($mapper, @infdata);
+ my @errs;
+ $mapper = process_maptbl($mapper, \@errs, @infdata);
if ( NULL eq $mapper )
{
+ print "@errs\n";
print "ERROR: failed to generate mapper\n";
exit 1;
}
- my @ents = getMappedEntries($mapper, \@ldiffiles, \&check_and_add_entry,
- [$conn, $confds_fresh, $confds_verbose]);
- if ( @ents )
+ getMappedEntries($mapper, \@ldiffiles, \@errs, \&check_and_add_entry,
+ [$conn, $confds_fresh, $confds_verbose]);
+ if ( @errs )
{
+ print "@errs\n";
print "ERROR: failed to register server info\n";
return 1;
}
Index: setup-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- setup-ds-admin.pl.in 29 Jun 2007 21:29:05 -0000 1.6
+++ setup-ds-admin.pl.in 4 Jul 2007 01:31:33 -0000 1.7
@@ -145,8 +145,12 @@
$setup->msg('create_dirserver');
# create a directory server instance
-my ($rc, $output) = createDSInstance($setup->{inf});
+my @errs = ();
+my ($rc, $output) = createDSInstance($setup->{inf}, \@errs);
if ($rc) {
+ if (@errs) {
+ $setup->msg(@errs);
+ }
$setup->msg($FATAL, 'error_creating_dsinstance', $rc, $output);
exit 1;
} else {
@@ -155,7 +159,6 @@
# setup directory server instance to be the configuration DS
if ($createconfigds) {
- my @errs = ();
$setup->msg('create_configds');
if (!createConfigDS($setup->{inf}, \@errs)) {
$setup->msg($FATAL, @errs);
@@ -165,7 +168,6 @@
}
else
{
- my @errs = ();
$setup->msg('create_configds');
if (!createSubDS($setup->{inf}, \@errs)) {
$setup->msg($FATAL, @errs);
@@ -175,7 +177,10 @@
}
# register ds instances with config DS
-if (!registerDSWithConfigDS($setup)) {
+if (!registerDSWithConfigDS($setup->{inf}->{slapd}->{ServerIdentifier},
+ \@errs,
+ $setup->{inf})) {
+ $setup->msg(@errs);
$setup->msg($FATAL, 'error_register_dirserver');
exit 1;
}
From fedora-directory-commits at redhat.com Wed Jul 4 01:31:36 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 3 Jul 2007 21:31:36 -0400
Subject: [Fedora-directory-commits] adminserver/tests/ds_create testget.1,
NONE, 1.1
Message-ID: <200707040131.l641Va9Z031072@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/tests/ds_create
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30934/adminserver/tests/ds_create
Added Files:
testget.1
Log Message:
Resolves: bug 246683
Bug Description: Reimplement ds_create without setuputil code
Reviewed by: nhosoi (Thanks!)
Fix Description: ds_create was a CGI program that would create a new instance, set it up to be managed by console, and register it with the config ds. The new ds_create CGI perl script does just that. One tricky part was that, rather than enabling the pass through auth plugin and having to restart the server, the new server is created without being started, then the modification is done to the new server dse.ldif file directly, using the new FileConn.pm module, which simulates a Mozilla::LDAP::Conn on an LDIF file. This also allows us to create a new instance with a pre-hashed rootdn password, rather than having to send the cleartext password.
I had to move around some code in AdminServer and AdminUtil so that I could use it from ds_create. I also implemented support for the admin server PASSWORD_PIPE in perl so we could use it in other CGI perl scripts.
Finally, the error handling was not consistent in our code, so I made explicit the passing of error messages up and down the stack. Oh how I wish we could just do this in python and use exception handling . . .
I added a test for ds_create.
Platforms tested: RHEL4
Flag Day: Yes - autotool changes
Doc impact: No. Should work the same way as the old ds_create.
--- NEW FILE testget.1 ---
servport=38900&cfg_sspt_uid=uid%3Dadmin%2C+ou%3DAdministrators%2C+ou%3DTopologyManagement%2C+o%3DNetscapeRoot&ldap_url=ldap%3A%2F%2Flocalhost.localdomain%3A1100%2Fo%3DNetscapeRoot&servuser=SETTOYOURUSERID&cfg_sspt_uid_pw=admin&rootpw=password&servid=localhost2&start_server=1&suitespot3x_uid=admin&suffix=dc%3Dexample%2Cdc%3Dcom&servname=localhost.localdomain&rootdn=cn%3DDirectory+Manager&admin_domain=localdomain
From fedora-directory-commits at redhat.com Wed Jul 4 01:31:36 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 3 Jul 2007 21:31:36 -0400
Subject: [Fedora-directory-commits] adminserver/tests setup.sh,1.1,1.2
Message-ID: <200707040131.l641VaNo031067@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/tests
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30934/adminserver/tests
Modified Files:
setup.sh
Log Message:
Resolves: bug 246683
Bug Description: Reimplement ds_create without setuputil code
Reviewed by: nhosoi (Thanks!)
Fix Description: ds_create was a CGI program that would create a new instance, set it up to be managed by console, and register it with the config ds. The new ds_create CGI perl script does just that. One tricky part was that, rather than enabling the pass through auth plugin and having to restart the server, the new server is created without being started, then the modification is done to the new server dse.ldif file directly, using the new FileConn.pm module, which simulates a Mozilla::LDAP::Conn on an LDIF file. This also allows us to create a new instance with a pre-hashed rootdn password, rather than having to send the cleartext password.
I had to move around some code in AdminServer and AdminUtil so that I could use it from ds_create. I also implemented support for the admin server PASSWORD_PIPE in perl so we could use it in other CGI perl scripts.
Finally, the error handling was not consistent in our code, so I made explicit the passing of error messages up and down the stack. Oh how I wish we could just do this in python and use exception handling . . .
I added a test for ds_create.
Platforms tested: RHEL4
Flag Day: Yes - autotool changes
Doc impact: No. Should work the same way as the old ds_create.
Index: setup.sh
===================================================================
RCS file: /cvs/dirsec/adminserver/tests/setup.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setup.sh 9 May 2007 00:26:39 -0000 1.1
+++ setup.sh 4 Jul 2007 01:31:33 -0000 1.2
@@ -10,9 +10,9 @@
#adminpw=boguspassword
adminpw=admin
#needinstance=1
-needdata=1
-usessl=1
-PATH=/usr/lib64/mozldap:$PATH
+#needdata=1
+#usessl=1
+PATH=/usr/lib64/mozldap:/usr/lib/mozldap:$PATH
export PATH
if [ "$needinstance" ] ; then
@@ -77,10 +77,11 @@
dir=`pwd`
# CGI env. vars
-ADMSERV_CONF_DIR=$dir/testtmp
-export ADMSERV_CONF_DIR
-ADMSERV_LOG_DIR=$dir/testtmp
-export ADMSERV_LOG_DIR
+#ADMSERV_CONF_DIR=$dir/testtmp
+#ADMSERV_CONF_DIR=$sroot/etc/fedora-ds/admin-serv
+#export ADMSERV_CONF_DIR
+#ADMSERV_LOG_DIR=$dir/testtmp
+#export ADMSERV_LOG_DIR
HTTP_ACCEPT_LANGUAGE=en
export HTTP_ACCEPT_LANGUAGE
SERVER_URL=http://localhost
@@ -95,15 +96,16 @@
SIEPWD: $adminpw
EOF
-VALGRIND="valgrind --log-file=/var/tmp/vg.out --tool=memcheck --leak-check=yes --suppressions=/home/rmeggins/valgrind.supp --num-callers=40 "
+VALGRIND="valgrind --log-file=/var/tmp/vg.out --tool=memcheck --leak-check=yes --suppressions=$HOME/valgrind.supp --num-callers=40 "
GDB="gdb -x .gdbinit "
-DEBUGCMD="$VALGRIND"
+#DEBUGCMD="$VALGRIND"
#DEBUGCMD="$GDB"
PROGS="mergeConfig admpw security ugdsconfig ReadLog start_config_ds \
config statpingserv viewdata dsconfig monreplication restartsrv \
statusping viewlog htmladmin sec-activate stopsrv download help"
-PROGS=restartsrv
+
+SCRIPTS=ds_create
# each prog has a subdir containing the GET/POST args and any other test data
for prog in $PROGS ; do
@@ -151,4 +153,26 @@
rm -f $postlist
done
+for prog in $SCRIPTS ; do
+ getlist=/tmp/gettests.$$
+ find $testdir/$prog -name testget.\* -print 2> /dev/null | sort -n > $getlist
+ for test in `cat $getlist` ; do
+ if [ ! -d results/$prog ] ; then mkdir -p results/$prog ; fi
+ basetest=`basename $test`
+ echo "Running test $test"
+ REQUEST_METHOD=GET ; export REQUEST_METHOD
+ QUERY_STRING="`cat $test`" ; export QUERY_STRING
+ SCRIPT_NAME=slapd/Tasks/Operation/$prog ; export SCRIPT_NAME
+ # open pwpfile for reading as file desc 4 - CGIs have to use stdin (0) for POST
+ exec 4<$pwpfile
+ PASSWORD_PIPE=4 ; export PASSWORD_PIPE
+ if [ -n "$DEBUGCMD" -a "$DEBUGCMD" = "$GDB" ] ; then
+ perl -d admserv/cgi-src40/$prog
+ else
+ perl -w admserv/cgi-src40/$prog
+ fi
+ done
+ rm -f $getlist
+done
+
rm -rf $pwpfile .gdbinit
From fedora-directory-commits at redhat.com Thu Jul 5 21:12:57 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 5 Jul 2007 17:12:57 -0400
Subject: [Fedora-directory-commits]
adminutil/include/libadminutil distadm.h, 1.4, 1.5
Message-ID: <200707052112.l65LCv5e012281@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/adminutil/include/libadminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12226/include/libadminutil
Modified Files:
distadm.h
Log Message:
Resolves: 247192
Summary: Modified the admldapBuildInfoCbk() function to pass the userdn through for authentication to the Directory if the userdn is initialized.
Index: distadm.h
===================================================================
RCS file: /cvs/dirsec/adminutil/include/libadminutil/distadm.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- distadm.h 4 Apr 2007 19:37:41 -0000 1.4
+++ distadm.h 5 Jul 2007 21:12:54 -0000 1.5
@@ -52,6 +52,9 @@
#ifndef ADM_SIEPWD_STRING
#define ADM_SIEPWD_STRING "SIEPWD: "
#endif
+#ifndef ADM_NOT_INITIALIZED
+#define ADM_NOT_INITIALIZED "NS-not-initialized"
+#endif
/* Initialize libadminutil. Should be called by EVERY CGI. */
/* util.c */
From fedora-directory-commits at redhat.com Thu Jul 5 21:12:57 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 5 Jul 2007 17:12:57 -0400
Subject: [Fedora-directory-commits]
adminutil/lib/libadminutil admutil.c, 1.8, 1.9 distadm.c, 1.3, 1.4
Message-ID: <200707052112.l65LCvu2012288@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/adminutil/lib/libadminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12226/lib/libadminutil
Modified Files:
admutil.c distadm.c
Log Message:
Resolves: 247192
Summary: Modified the admldapBuildInfoCbk() function to pass the userdn through for authentication to the Directory if the userdn is initialized.
Index: admutil.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadminutil/admutil.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- admutil.c 8 May 2007 19:13:25 -0000 1.8
+++ admutil.c 5 Jul 2007 21:12:55 -0000 1.9
@@ -1276,6 +1276,8 @@
admldapBuildInfoCbk(char* configRoot, char *(*cbk)(), int *errorcode)
{
char *siePasswd = NULL;
+ char *siedn = NULL;
+ char *userdn = NULL;
AdmldapHdnlPtr admInfo = NULL;
int ldapError = LDAP_SUCCESS;
int secureLDAP = 0;
@@ -1294,6 +1296,14 @@
secureLDAP = 1;
}
+ /* if userdn is initialized, override the siedn to make bind succeed */
+ ADM_GetUserDNString(errorcode, &userdn);
+ if (strcasecmp(userdn, ADM_NOT_INITIALIZED)) {
+ siedn = admldapGetSIEDN(admInfo);
+ admldapSetSIEDN(admInfo, userdn);
+ admSetCachedSIEPWD(siePasswd);
+ }
+
if (!secureLDAP) {
admInfo->ldapHndl = ldap_init(admInfo->ldapInfo->lud_host, admInfo->ldapInfo->lud_port);
}
@@ -1377,6 +1387,12 @@
admInfo->passwd=PL_strdup(siePasswd);
}
+ /* Reset the siedn if we changed it*/
+ if (siedn) {
+ admldapSetSIEDN(admInfo, siedn);
+ PL_strfree(siedn);
+ }
+
return (AdmldapInfo)admInfo;
}
Index: distadm.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadminutil/distadm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- distadm.c 4 Apr 2007 19:37:36 -0000 1.3
+++ distadm.c 5 Jul 2007 21:12:55 -0000 1.4
@@ -103,9 +103,6 @@
#endif
*/
-/* Yeah, I know, globals suck. */
-#define ADM_NOT_INITIALIZED "NS-not-initialized"
-
#ifndef BIG_LINE
#define BIG_LINE 1024
#endif
From fedora-directory-commits at redhat.com Thu Jul 5 23:53:44 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 5 Jul 2007 19:53:44 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd/tools/ldclt ldapfct.c, 1.3,
1.4 ldclt.c, 1.4, 1.5 ldclt.h, 1.3, 1.4 ldcltU.c, 1.3,
1.4 threadMain.c, 1.2, 1.3
Message-ID: <200707052353.l65NriqV017336@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17002
Modified Files:
ldapfct.c ldclt.c ldclt.h ldcltU.c threadMain.c
Log Message:
Resolves: #246690
Summary: feature request for ldclt: add randomauthid for testing
Description: Adding randomauthid options: -e "randomauthid" -e "randomauthidlow=" -e "randomauthidhigh="
Index: ldapfct.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/ldapfct.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ldapfct.c 8 Jun 2007 23:19:19 -0000 1.3
+++ ldapfct.c 5 Jul 2007 23:53:41 -0000 1.4
@@ -807,6 +807,7 @@
(mctx.mode & BIND_EACH_OPER))) {
void *defaults;
LDAPControl **rctrls = NULL;
+ char *my_saslauthid = NULL;
if ( mctx.sasl_mech == NULL) {
fprintf( stderr, "Please specify the SASL mechanism name when "
@@ -825,13 +826,32 @@
}
}
+ /*
+ * Generate the random authid if set up so
+ */
+ if (mctx.mod2 & M2_RANDOM_SASLAUTHID)
+ {
+ rnd (tttctx->buf2, mctx.sasl_authid_low, mctx.sasl_authid_high,
+ mctx.sasl_authid_nbdigit);
+ strncpy (&(tttctx->bufSaslAuthid[tttctx->startSaslAuthid]),
+ tttctx->buf2, mctx.sasl_authid_nbdigit);
+ my_saslauthid = tttctx->bufSaslAuthid;
+ if (mctx.mode & VERY_VERBOSE)
+ printf ("ldclt[%d]: T%03d: Sasl Authid=\"%s\"\n",
+ mctx.pid, tttctx->thrdNum, tttctx->bufSaslAuthid);
+ }
+ else
+ {
+ my_saslauthid = mctx.sasl_authid;
+ }
+
defaults = ldaptool_set_sasl_defaults( tttctx->ldapCtx, mctx.sasl_flags, mctx.sasl_mech,
- mctx.sasl_authid, mctx.sasl_username, mctx.passwd, mctx.sasl_realm );
+ my_saslauthid, mctx.sasl_username, mctx.passwd, mctx.sasl_realm );
if (defaults == NULL) {
perror ("malloc");
exit (LDAP_NO_MEMORY);
}
-
+
ret = ldap_sasl_interactive_bind_ext_s( tttctx->ldapCtx, mctx.bindDN, mctx.sasl_mech,
NULL, NULL, mctx.sasl_flags,
ldaptool_sasl_interact, defaults, NULL );
Index: ldclt.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/ldclt.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ldclt.c 8 Jun 2007 23:19:20 -0000 1.4
+++ ldclt.c 5 Jul 2007 23:53:41 -0000 1.5
@@ -1496,7 +1496,7 @@
} /*JLS 19-03-01*/
/*
- * Maybe random filter to prepear ?
+ * Maybe random filter to prepare ?
*/
if ((mctx.mode & (RANDOM | INCREMENTAL)) &&
(!(mctx.mod2 & M2_RDN_VALUE))) /*JLS 23-03-01*/
@@ -1510,7 +1510,7 @@
}
/*
- * Maybe random base DN to prepear ?
+ * Maybe random base DN to prepare ?
*/
if (mctx.mode & RANDOM_BASE)
{
@@ -1523,7 +1523,7 @@
}
/*
- * Maybe random bind DN to prepear ?
+ * Maybe random bind DN to prepare ?
*/
if (mctx.mode & RANDOM_BINDDN) /*JLS 05-01-01*/
{ /*JLS 05-01-01*/
@@ -1542,7 +1542,20 @@
} /*JLS 05-01-01*/
/*
- * Maybe an attribute replacement to prepear ?
+ * Maybe random authid to prepare ?
+ */
+ if (mctx.mod2 & M2_RANDOM_SASLAUTHID)
+ {
+ if (parseFilter (mctx.sasl_authid, &(mctx.sasl_authid_head),
+ &(mctx.sasl_authid_tail), &(mctx.sasl_authid_nbdigit)) < 0)
+ {
+ printf ("Error: cannot parse bind DN...\n");
+ return (-1);
+ }
+ }
+
+ /*
+ * Maybe an attribute replacement to prepare ?
*/
if (mctx.mode & ATTR_REPLACE) /*JLS 21-11-00*/
{ /*JLS 21-11-00*/
@@ -1753,6 +1766,8 @@
printf (" ssl_with_client_authentication"); /* BK 23-11-00*/
if (mctx.mod2 & M2_SASLAUTH)
printf (" saslauth");
+ if (mctx.mod2 & M2_RANDOM_SASLAUTHID)
+ printf (" randomauthid");
if (mctx.mode & SMOOTHSHUTDOWN) /*JLS 17-11-00*/
printf (" smoothshutdown"); /*JLS 17-11-00*/
if (mctx.mode & DONT_SLEEP_DOWN) /*JLS 14-03-01*/
@@ -2206,6 +2221,12 @@
"randombinddnfromfile", /*JLS 03-05-01*/
#define EP_BINDONLY 45 /*JLS 04-05-01*/
"bindonly", /*JLS 04-05-01*/
+#define EP_RANDOMSASLAUTHID 46
+ "randomauthid",
+#define EP_RANDOMSASLAUTHIDHIGH 47
+ "randomauthidhigh",
+#define EP_RANDOMSASLAUTHIDLOW 48
+ "randomauthidlow",
NULL
};
@@ -2416,6 +2437,27 @@
} /*JLS 12-01-01*/
mctx.bindDNLow = atoi (subvalue); /*JLS 05-01-01*/
break; /*JLS 05-01-01*/
+ case EP_RANDOMSASLAUTHID:
+ mctx.mod2 |= M2_RANDOM_SASLAUTHID;
+ break;
+ case EP_RANDOMSASLAUTHIDHIGH:
+ mctx.mod2 |= M2_RANDOM_SASLAUTHID;
+ if (subvalue == NULL)
+ {
+ fprintf(stderr,"Error: missing arg randomauthidhigh\n");
+ return (-1);
+ }
+ mctx.sasl_authid_high = atoi (subvalue);
+ break;
+ case EP_RANDOMSASLAUTHIDLOW:
+ mctx.mod2 |= M2_RANDOM_SASLAUTHID;
+ if (subvalue == NULL)
+ {
+ fprintf(stderr, "Error: missing arg randomauthidlow\n");
+ return (-1);
+ }
+ mctx.sasl_authid_low = atoi (subvalue);
+ break;
case EP_RDN: /*JLS 23-03-01*/
if (decodeRdnParam (subvalue) < 0) /*JLS 23-03-01*/
return (-1); /*JLS 23-03-01*/
@@ -2931,6 +2973,14 @@
fprintf(stderr,"Error: use option -e randombinddnhigh=\n"); /*JLS 05-01-01*/
ldcltExit (EXIT_PARAMS); /*JLS 05-01-01*/
} /*JLS 05-01-01*/
+ if ((mctx.mod2 & M2_RANDOM_SASLAUTHID) &&
+ ((mctx.sasl_authid_low < 0) || (mctx.sasl_authid_high < 0)))
+ {
+ fprintf(stderr,"Error: missing ranges for randomauthid.\n");
+ fprintf(stderr,"Error: use option -e randomauthidlow=\n");
+ fprintf(stderr,"Error: use option -e randomauthidhigh=\n");
+ ldcltExit (EXIT_PARAMS); /*JLS 05-01-01*/
+ } /*JLS 05-01-01*/
if (mctx.mode & CLTAUTH) /* BK 23-11-00*/
{ /* BK 23-11-00*/
if (!(mctx.mode & SSL)) /* BK 23-11-00*/
@@ -3136,6 +3186,13 @@
printf ("Bind passwd's head = \"%s\"\n", mctx.passwdHead);/*JLS 05-01-01*/
printf ("Bind passwd's tail = \"%s\"\n", mctx.passwdTail);/*JLS 05-01-01*/
} /*JLS 05-01-01*/
+ if (mctx.mod2 & M2_RANDOM_SASLAUTHID)
+ { /*JLS 05-01-01*/
+ printf ("Bind Authid's head = \"%s\"\n", mctx.sasl_authid_head);
+ printf ("Bind Authid's tail = \"%s\"\n", mctx.sasl_authid_tail);
+ printf ("Bind Authid's range = [%d , %d]\n",
+ mctx.sasl_authid_low, mctx.sasl_authid_high);
+ } /*JLS 05-01-01*/
if (mctx.mode & ATTR_REPLACE) /*JLS 21-11-00*/
{ /*JLS 21-11-00*/
printf ("Attribute's head = \"%s\"\n", mctx.attrplHead);/*JLS 21-11-00*/
Index: ldclt.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/ldclt.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ldclt.h 8 Jun 2007 23:19:20 -0000 1.3
+++ ldclt.h 5 Jul 2007 23:53:41 -0000 1.4
@@ -283,6 +283,7 @@
#define M2_RNDBINDFILE 0x00000010 /* -e randombinddnfromfile *//*JLS 03-05-01*/
#define M2_BINDONLY 0x00000020 /* -e bindonly */ /*JLS 04-05-01*/
#define M2_SASLAUTH 0x00000040 /* -o : SASL authentication */
+#define M2_RANDOM_SASLAUTHID 0x00000080 /* -e randomauthid */
/*
* Combinatory defines
@@ -563,6 +564,11 @@
int referral; /* Referral followed */ /*JLS 08-03-01*/
int sampling; /* Sampling frequency */
char *sasl_authid;
+ int sasl_authid_low; /* authid's low val */
+ int sasl_authid_high; /* authid's high val */
+ int sasl_authid_nbdigit; /* authid's ndigits */
+ char *sasl_authid_head; /* authid's head */
+ char *sasl_authid_tail; /* authid's tail */
unsigned sasl_flags;
char *sasl_mech;
char *sasl_realm;
@@ -636,6 +642,7 @@
char *bufBindDN; /* Bind DN to use */ /*JLS 05-01-01*/
char *bufFilter; /* Filter to use */
char *bufPasswd; /* Bind passwd to use *//*JLS 05-01-01*/
+ char *bufSaslAuthid; /* Sasl Authid to use */
/*
* Note about matcheddnp management. This pointer is managed by the
* function dnFromMessage() that need it to free or remember the string
@@ -647,6 +654,7 @@
int startBindDN; /* Insert random here *//*JLS 05-01-01*/
int startPasswd; /* Insert random here *//*JLS 05-01-01*/
int startRandom; /* Insert random here */
+ int startSaslAuthid; /* Insert random here */
msgid_cell *firstMsgId; /* pending messages */
msgid_cell *lastMsgId; /* last one */
} thread_context;
Index: ldcltU.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/ldcltU.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ldcltU.c 8 Jun 2007 23:19:20 -0000 1.3
+++ ldcltU.c 5 Jul 2007 23:53:41 -0000 1.4
@@ -201,6 +201,9 @@
(void) printf (" string : create random strings rather than random numbers.\n");
(void) printf (" v2 : ldap v2.\n");
(void) printf (" withnewparent : rename with newparent specified as argument.\n");
+ (void) printf (" randomauthid : random SASL Authid.\n");
+ (void) printf (" randomauthidlow=value : low value for random SASL Authid.\n");
+ (void) printf (" randomauthidhigh=value : high value for random SASL Authid.\n");
(void) printf (" -f Filter for searches.\n");
(void) printf (" -h Host to connect. Default \"localhost\".\n");
(void) printf (" -i Number of times inactivity allowed. Default 3 (30 seconds)\n");
Index: threadMain.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/threadMain.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- threadMain.c 10 Nov 2006 23:45:50 -0000 1.2
+++ threadMain.c 5 Jul 2007 23:53:41 -0000 1.3
@@ -1073,6 +1073,29 @@
mctx.passwd = "foo bar"; /* trick... */ /*JLS 03-05-01*/
} /*JLS 03-05-01*/
+ /*
+ * Variable Authid ?
+ */
+ if (mctx.sasl_authid != NULL)
+ {
+ tttctx->bufSaslAuthid = (char *) malloc (strlen (mctx.sasl_authid) + 1);
+ if (tttctx->bufSaslAuthid == NULL)
+ {
+ printf ("ldclt[%d]: T%03d: cannot malloc(tttctx->bufSaslAuthid), error=%d (%s)\n",
+ mctx.pid, tttctx->thrdNum, errno, strerror (errno));
+ ldcltExit (EXIT_INIT);
+ }
+ if (!(mctx.mod2 & M2_RANDOM_SASLAUTHID))
+ strcpy (tttctx->bufSaslAuthid, mctx.sasl_authid);
+ else
+ {
+ tttctx->startSaslAuthid = strlen (mctx.sasl_authid_head);
+ strcpy (tttctx->bufSaslAuthid, mctx.sasl_authid_head);
+ strcpy (&(tttctx->bufSaslAuthid[tttctx->startSaslAuthid+mctx.sasl_authid_nbdigit]),
+ mctx.sasl_authid_tail);
+ }
+ }
+
/*
* Initiates the attribute replace buffers
*/
From fedora-directory-commits at redhat.com Fri Jul 6 17:39:38 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 6 Jul 2007 13:39:38 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
Util.pm.in, 1.5, 1.6
Message-ID: <200707061739.l66HdcV8001031@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv794
Modified Files:
Util.pm.in
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #1)
Description: 1) introduced delete entry operation.
2) cleaned up check_and_add code
Index: Util.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Util.pm.in 4 Jul 2007 01:28:17 -0000 1.5
+++ Util.pm.in 6 Jul 2007 17:39:36 -0000 1.6
@@ -233,21 +233,18 @@
}
do
{
- my $needtoadd;
my @addtypes; # list of attr types for mod add
my @reptypes; # list of attr types for mod replace
my @deltypes; # list of attr types for mod delete
- my $MOD_NONE = 0;
- my $MOD_ADD = 1;
- my $MOD_REPLACE = 2;
- my $MOD_SPECIAL = 3;
- # $needtomod stores either of the above $MOD_ values
- # note: delete is not supported
- my $needtomod;
+ my $OP_NONE = 0;
+ my $OP_ADD = 1;
+ my $OP_MOD = 2;
+ my $OP_DEL = 3;
+ # $op stores either of the above $OP_ values
+ my $op = $OP_NONE;
if ( 0 > $#ctypes ) # aentry: complete entry
{
- $needtoadd = 1;
- $needtomod = 0; #$MOD_NONE
+ $op = $OP_ADD;
my $rc = -1;
if ( $sentry && !$fresh )
@@ -258,13 +255,12 @@
{
# the identical entry exists on the configuration DS.
# no need to add the entry.
- $needtoadd = 0;
+ $op = $OP_NONE;
goto out;
}
elsif ( (1 == $rc) && !$fresh )
{
- $needtoadd = 0;
- $needtomod = $MOD_ADD;
+ $op = $OP_MOD;
@addtypes = keys %{$aentry}; # add all attrs
}
elsif ( $sentry && $sentry->{dn} )
@@ -284,21 +280,27 @@
}
else # aentry: modify format
{
- $needtoadd = 0;
if ( $sentry )
{
- @addtypes = $aentry->getValues("add");
- @reptypes = $aentry->getValues("replace");
- @deltypes = $aentry->getValues("delete");
- $needtomod = $MOD_REPLACE;
+ if ( "delete" eq lc($ctypes[0]) )
+ {
+ $op = $OP_DEL;
+ }
+ else
+ {
+ @addtypes = $aentry->getValues("add");
+ @reptypes = $aentry->getValues("replace");
+ @deltypes = $aentry->getValues("delete");
+ $op = $OP_MOD;
+ }
}
else
{
- $needtomod = $MOD_NONE;
+ $op = $OP_NONE;
}
}
- if ( 1 == $needtoadd )
+ if ( $OP_ADD == $op )
{
$conn->add($aentry);
my $rc = $conn->getErrorCode();
@@ -313,20 +315,20 @@
}
debug(1, "Entry $aentry->{dn} is added\n");
}
- elsif ( 0 < $needtomod ) # $sentry exists
+ elsif ( $OP_DEL == $op )
{
- my $attr;
- if ( $needtomod == $MOD_SPECIAL )
+ my $rc = delete_all($conn, $sentry);
+ if ( 0 != $rc )
{
- debug(3, "Doing MOD_SPECIAL for entry $aentry->{dn}\n");
- foreach $attr ( keys %speciallist )
- {
- foreach my $nval ( @{$aentry->{$attr}} )
- {
- $sentry->addValue( $attr, $nval );
- }
- }
+ push @{$errs}, 'error_deleteall_entries', $sentry->{dn}, $conn->getErrorString();
+ debug(1, "Error deleting $sentry->{dn}\n");
+ return 0;
}
+ debug(1, "Entry $aentry->{dn} is deleted\n");
+ }
+ elsif ( 0 < $op ) # $sentry exists
+ {
+ my $attr;
foreach $attr ( @addtypes )
{
debug(3, "Adding attr=$attr values=" . $aentry->getValues($attr) . " to entry $aentry->{dn}\n");
@@ -670,6 +672,8 @@
else
{
# get the value from one of the Inf passed in
+ # they $value could be pure Key or Key:"default_value"
+ my ($key_value, $default_value) = split(/:/, $value, 2);
my $infsection;
foreach my $thisinf (@infdata)
{
@@ -677,17 +681,25 @@
{
$infsection = $thisinf->{$section0};
next if (!ref($infsection));
- if (defined($infsection->{$value}))
+ if (defined($infsection->{$key_value}))
{
- $mapper->{$key} = $infsection->{$value};
+ $mapper->{$key} = $infsection->{$key_value};
next KEY;
}
}
}
if (!defined($infsection->{$value}))
{
- push @{$errs}, 'no_mapvalue_for_key', $value, $key;
- return {};
+ if ($default_value ne "")
+ {
+ $default_value =~ tr/\"//d; # default_value is a regular double quoted string - remove quotes
+ $mapper->{$key} = $default_value;
+ }
+ else
+ {
+ push @{$errs}, 'no_mapvalue_for_key', $value, $key;
+ return {};
+ }
}
}
}
From fedora-directory-commits at redhat.com Fri Jul 6 17:41:20 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 6 Jul 2007 13:41:20 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/schema/ldif
10rm_dsdata.ldif.tmpl, NONE, 1.1
Message-ID: <200707061741.l66HfK1K001293@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1070
Added Files:
10rm_dsdata.ldif.tmpl
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #2)
Description: This is a tmpl file to clean up the Configuration entries
belonging to the removed Directory Server instance.
--- NEW FILE 10rm_dsdata.ldif.tmpl ---
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# END COPYRIGHT BLOCK
dn: o=NetscapeRoot
changetype: modify
delete: aci
aci: (targetattr = "*")(version 3.0; acl "SIE Group"; allow (all) groupdn = "ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
dn: cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
changetype: modify
delete: uniqueMember
uniqueMember: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
dn: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
changetype: delete
dn: cn=configuration,cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
changetype: delete
dn: ou="cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot",ou=UserPreferences, ou=%domain%, o=NetscapeRoot
changetype: delete
From fedora-directory-commits at redhat.com Fri Jul 6 18:06:21 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 6 Jul 2007 14:06:21 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40 ReadLog.c,
1.7, 1.8 config.c, 1.11, 1.12 sec-activate.c, 1.9, 1.10
Message-ID: <200707061806.l66I6LwN013416@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13246/admserv/cgi-src40
Modified Files:
ReadLog.c config.c sec-activate.c
Log Message:
Resolves: 247283
Summary: Fixed multiple problems with CGIs used by Admin Server Console.
Index: ReadLog.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ReadLog.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ReadLog.c 11 May 2007 19:44:05 -0000 1.7
+++ ReadLog.c 6 Jul 2007 18:06:19 -0000 1.8
@@ -87,15 +87,10 @@
int getLogNames()
{
- char line[BIG_LINE];
- const char *logdir = util_get_log_dir();
+ char line[BIG_LINE];
const char *configdir = util_get_conf_dir();
- char filename[BIG_LINE];
- FILE *f;
-
- if (!logdir) {
- return 0;
- }
+ char filename[BIG_LINE];
+ FILE *f;
if (!util_find_file_in_paths(filename, sizeof(filename), "local.conf",
configdir, "", "admin-serv/config")) {
@@ -112,12 +107,12 @@
if(PL_strcasestr(line, "nserrorlog"))
{
- PR_snprintf(errorlog, sizeof(errorlog), "%s/%s", logdir, getLogName(line));
+ PR_snprintf(errorlog, sizeof(errorlog), "%s", getLogName(line));
}
else
if(PL_strcasestr(line, "nsaccesslog"))
{
- PR_snprintf(accesslog, sizeof(accesslog), "%s/%s", logdir, getLogName(line));
+ PR_snprintf(accesslog, sizeof(accesslog), "%s", getLogName(line));
}
}
fclose(f);
Index: config.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/config.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config.c 22 Jun 2007 01:34:19 -0000 1.11
+++ config.c 6 Jul 2007 18:06:19 -0000 1.12
@@ -225,10 +225,6 @@
if (binddn) rv = ADM_GetCurrentPassword(&err, &bindpw);
adminfo = admldapBuildInfo(configdir, &rv);
- if (adminfo) {
- binddn = admldapGetSIEDN(adminfo);
- bindpw = admldapGetSIEPWD(adminfo);
- }
errorCode = ADMSSL_InitSimple(configdir, secdir, 0);
if (errorCode) {
Index: sec-activate.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/sec-activate.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sec-activate.c 11 May 2007 19:44:05 -0000 1.9
+++ sec-activate.c 6 Jul 2007 18:06:19 -0000 1.10
@@ -607,16 +607,6 @@
ssl3_act = get_cgi_var("ssl3-activated", "", "");
clientauth = get_cgi_var("clientauth", "", "");
- /* Parse out complete family list */
- get_family_input(&family_head);
-
- /* SET SSL VARIABLES via pset */
-
- /* first, cipher family info */
- SetSSLFamilyAttributes(pset, family_head, ssl2, ssl3, ssl2_act, ssl3_act);
-
- set_attribute(pset, "configuration.encryption.nsSSLClientAuth", clientauth);
-
/* change "security" in LDAP and adm.conf to "on"/"off" */
set_security(pset, configdir, security);
@@ -632,6 +622,14 @@
char protocols[BIG_LINE];
char ciphers[BIG_LINE];
+ /* Parse out complete family list */
+ get_family_input(&family_head);
+
+ /* set cipher family info */
+ SetSSLFamilyAttributes(pset, family_head, ssl2, ssl3, ssl2_act, ssl3_act);
+
+ set_attribute(pset, "configuration.encryption.nsSSLClientAuth", clientauth);
+
if (get_cert_nickname(certnickname, sizeof(certnickname)) < 0) {
char * scratch = PR_smprintf(getResourceString(DBT_CGI_MISSING_ARGS), certnickname);
rpt_err(ELEM_MISSING, NULL, scratch, NULL);
From fedora-directory-commits at redhat.com Fri Jul 6 18:06:21 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 6 Jul 2007 14:06:21 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
adminserver.map.in, 1.4, 1.5 register_param.map.in, 1.5, 1.6
Message-ID: <200707061806.l66I6LYk013435@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13246/admserv/newinst/src
Modified Files:
adminserver.map.in register_param.map.in
Log Message:
Resolves: 247283
Summary: Fixed multiple problems with CGIs used by Admin Server Console.
Index: adminserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/adminserver.map.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- adminserver.map.in 25 Jun 2007 18:23:53 -0000 1.4
+++ adminserver.map.in 6 Jul 2007 18:06:19 -0000 1.5
@@ -64,7 +64,7 @@
asid = `use Net::Domain qw(hostname); $returnvalue = hostname();`
as_port = Port
admpw = "@configdir@/admpw"
-as_error = "@logdir@/errors"
+as_error = "@logdir@/error"
as_access = "@logdir@/access"
as_pid = "@pidfile@"
as_console_jar = "%normbrand%-admserv-%as_baseversion%.jar"
Index: register_param.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- register_param.map.in 28 Jun 2007 16:24:41 -0000 1.5
+++ register_param.map.in 6 Jul 2007 18:06:19 -0000 1.6
@@ -68,7 +68,7 @@
asid = `use Net::Domain qw(hostname); $returnvalue = hostname();`
as_port = Port
admpw = "@configdir@/admpw"
-as_error = "@logdir@/errors"
+as_error = "@logdir@/error"
as_access = "@logdir@/access"
as_pid = "@pidfile@"
as_console_jar = "%normbrand%-admserv-%as_baseversion%.jar"
From fedora-directory-commits at redhat.com Fri Jul 6 18:06:23 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 6 Jul 2007 14:06:23 -0400
Subject: [Fedora-directory-commits] mod_admserv mod_admserv.c,1.31,1.32
Message-ID: <200707061806.l66I6NA7013447@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13246/mod_admserv
Modified Files:
mod_admserv.c
Log Message:
Resolves: 247283
Summary: Fixed multiple problems with CGIs used by Admin Server Console.
Index: mod_admserv.c
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_admserv.c 22 Jun 2007 22:37:46 -0000 1.31
+++ mod_admserv.c 6 Jul 2007 18:06:19 -0000 1.32
@@ -772,15 +772,17 @@
}
static int
-buildUGInfo(char** errorInfo, const server_rec *s) {
+buildUGInfo(char** errorInfo, const request_rec *r) {
AdmldapInfo info = NULL;
+ server_rec *s = r->server;
int error = 0;
char path[PATH_MAX];
char *userGroupLdapURL = NULL;
char *userGroupBindDN = NULL;
char *userGroupBindPW = NULL;
char *dirInfoRef = NULL;
- int retval = FALSE;
+ int retval = FALSE;
+ char *siedn = NULL;
*errorInfo = (char*)"";
@@ -792,26 +794,40 @@
goto done;
}
- if (!(info = admldapBuildInfo(configdir, &error))) {
+ if (!(info = admldapBuildInfoOnly(configdir, &error))) {
ap_log_error(APLOG_MARK, APLOG_CRIT, 0 /* status */, s,
"buildUGInfo(): unable to create AdmldapInfo (error code = %d)",
error);
goto done;
}
+ /* Temporarily override the siedn. This needs to be
+ * done to get a valid LDAP handle.
+ */
+ siedn = admldapGetSIEDN(info);
+
+ admldapSetSIEDN(info, apr_table_get(r->notes, RQ_NOTES_USERDN));
+ admSetCachedSIEPWD(apr_table_get(r->notes, RQ_NOTES_USERPW));
+
+
if (admldapGetSecurity(info)) {
sslinit(info, configdir);
- if (admldapBuildInfoSSL(info, &error)) {
- } else {
- char *host = admldapGetHost(info);
- ap_log_error(APLOG_MARK, APLOG_CRIT, 0 /* status */, s,
- "buildUGInfo(): unable to initialize TLS connection to LDAP host %s port %d: %d",
- host, admldapGetPort(info), error);
- PL_strfree(host);
- goto done;
- }
}
+ if (!admldapBuildInfoSSL(info, &error)) {
+ char *host = admldapGetHost(info);
+ ap_log_error(APLOG_MARK, APLOG_CRIT, 0 /* status */, s,
+ "buildUGInfo(): unable to initialize TLS connection to LDAP host %s port %d: %d",
+ host, admldapGetPort(info), error);
+ PL_strfree(host);
+ goto done;
+ }
+
+ /* We need to reset the siedn before we call
+ * admldapGetLocalUserDirectory below.
+ */
+ admldapSetSIEDN(info, siedn);
+
userGroupServer.host = NULL;
userGroupServer.port = 0;
userGroupServer.secure = 0;
@@ -839,7 +855,7 @@
goto done;
}
}
-
+
if (!extractLdapServerData(&userGroupServer, userGroupLdapURL, s)) {
*errorInfo = (char*)"unable to extract User/Group LDAP info";
goto done;
@@ -849,6 +865,7 @@
retval = TRUE; /* made it here, so success */
done:
+ PL_strfree(siedn);
PL_strfree(userGroupLdapURL);
PL_strfree(userGroupBindDN);
PL_strfree(userGroupBindPW);
@@ -2211,19 +2228,12 @@
destroyAdmldap(info);
info = NULL;
- /* DT 5/18/98 Change for new User/Group stuff */
-
- /* Populate U/G Info */
+ /* Initialize the UG host to NULL. This will cause the
+ * UG info to be loaded the first time a user authenticates.
+ */
userGroupServer.host = NULL;
- if (buildUGInfo(&errorInfo, base_server) != TRUE) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, 0, base_server,
- "mod_admserv_post_config(): unable to build user/group LDAP server info: %s",
- errorInfo);
- return DONE;
- }
-
/* Register the admin server tasks */
task_register_server(ADMIN_SERVER_ID, registryServer.admservSieDN);
@@ -2418,6 +2428,8 @@
static int userauth(request_rec *r)
{
+ char *dummy = NULL;
+
if (strcmp(r->handler, "user-auth"))
return DECLINED;
@@ -2425,6 +2437,11 @@
if (r->method_number != M_GET)
return DECLINED;
+ /* If U/G Info is not available, try to get it */
+ if (!(userGroupServer.host)) {
+ buildUGInfo(&dummy, r);
+ }
+
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, "userauth, bind %s",
apr_table_get(r->notes, RQ_NOTES_USERDN));
@@ -2614,7 +2631,7 @@
/* If U/G Info is not available, try to get it */
if (!(userGroupServer.host)) {
- buildUGInfo(&dummy, r->server);
+ buildUGInfo(&dummy, r);
}
if (userGroupServer.host) {
From fedora-directory-commits at redhat.com Mon Jul 9 19:01:03 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 9 Jul 2007 15:01:03 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/topology
AbstractServerObject.java, 1.3, 1.4 ServerNode.java, 1.3, 1.4
Message-ID: <200707091901.l69J13cE016508@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/topology
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14044/src/com/netscape/management/client/topology
Modified Files:
AbstractServerObject.java ServerNode.java
Log Message:
Resolves: 247517
Summary: Removed clone server config menu option.
Index: AbstractServerObject.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/AbstractServerObject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractServerObject.java 3 Jul 2007 17:27:03 -0000 1.3
+++ AbstractServerObject.java 9 Jul 2007 19:01:01 -0000 1.4
@@ -645,7 +645,7 @@
* @return true if server allows cloning operations
*/
public boolean isCloningEnabled() {
- return true;
+ return false;
}
/**
Index: ServerNode.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/ServerNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServerNode.java 3 Jul 2007 17:27:03 -0000 1.3
+++ ServerNode.java 9 Jul 2007 19:01:01 -0000 1.4
@@ -384,7 +384,7 @@
if (selection != null && selection.length == 1)
{
enableSetACLMenuItem = true;
- enableCloneMenuItem = true;
+ enableCloneMenuItem = false;
if (serverObject instanceof AbstractServerObject)
{
AbstractServerObject aso = (AbstractServerObject)serverObject;
@@ -546,9 +546,11 @@
return new IMenuItem[]{ new MenuItemText(MENU_OPEN_SERVER,
resource.getString("menu", "open"), "",
enableOpenMenuItem),
+ /*
new MenuItemText(MENU_CLONE_SERVER,
resource.getString("menu", "CloneServer"), "",
enableCloneMenuItem),
+ */
new MenuItemText(MENU_REMOVE_SERVER,
resource.getString("menu", "RemoveServer"), "",
enableRemoveMenuItem), new MenuItemSeparator(),
From fedora-directory-commits at redhat.com Mon Jul 9 20:10:12 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 9 Jul 2007 16:10:12 -0400
Subject: [Fedora-directory-commits] admservconsole
fedora-admserv-console.spec, NONE, 1.1 build.properties, 1.3,
1.4 build.xml, 1.1.1.1, 1.2
Message-ID: <200707092010.l69KAC7C007166@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/admservconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6902
Modified Files:
build.properties build.xml
Added Files:
fedora-admserv-console.spec
Log Message:
Resolves: 247525
Summary: Fixed parameters passed to ReadLog CGI. Also some packaging/build changes for building RPMs as well as a version bump.
--- NEW FILE fedora-admserv-console.spec ---
%define major_version 1.1
%define minor_version 0
Name: fedora-admserv-console
Version: %{major_version}.%{minor_version}
Release: 1
Group: Applications
Vendor: Fedora Project
URL: http://directory.fedora.redhat.com
License: LGPL
Packager: Red Hat, Inc.
Summary: Fedora Directory Server Management Console
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildArch: noarch
Source: %{name}-%{version}.tar.gz
Autoreq: 0
AutoReqProv: no
BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, fedora-console-framework >= 1.1
%description
A Java based remote management console used for Managing Fedora
Administration Server.
# prep and setup expect there to be a Source file
# in the /usr/src/redhat/SOURCES directory - it will be unpacked
# in the _builddir (not BuildRoot)
%prep
%setup -q
%build
cd admservconsole
ant -Dconsole.location=/usr/share/java
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/usr/share/java
install -m777 built/package/fedora-admserv* $RPM_BUILD_ROOT/usr/share/java
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
/usr/share/java/fedora-admserv-%{version}.jar
/usr/share/java/fedora-admserv-%{version}_en.jar
%post
cd /usr/share/java
ln -s fedora-admserv-%{version}.jar fedora-admserv-%{major_version}.jar
ln -s fedora-admserv-%{version}.jar fedora-admserv.jar
ln -s fedora-admserv-%{version}_en.jar fedora-admserv-%{major_version}_en.jar
ln -s fedora-admserv-%{version}_en.jar fedora-admserv_en.jar
%preun
rm -rf /usr/share/java/fedora-admserv-%{major_version}.jar
rm -rf /usr/share/java/fedora-admserv.jar
rm -rf /usr/share/java/fedora-admserv-%{major_version}_en.jar
rm -rf /usr/share/java/fedora-admserv_en.jar
%changelog
* Tue Jul 03 2007 Nathan Kinder 1.1.0-1
- Initial creation
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/admservconsole/build.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.properties 29 Sep 2006 17:17:27 -0000 1.3
+++ build.properties 9 Jul 2007 20:10:09 -0000 1.4
@@ -21,8 +21,8 @@
lang=en
admservconsole.root=..
-admservconsole.version=1.0.3
-admservconsole.gen.version=1.0
+admservconsole.version=1.1.0
+admservconsole.gen.version=1.1
brand=fedora
admservconsole.name=${brand}-admserv-${admservconsole.version}
admservconsole.gen.name=${brand}-admserv-${admservconsole.gen.version}
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/admservconsole/build.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- build.xml 22 May 2006 18:14:31 -0000 1.1.1.1
+++ build.xml 9 Jul 2007 20:10:09 -0000 1.2
@@ -82,10 +82,10 @@
-
-
-
-
+
+
+
+
@@ -115,12 +115,6 @@
-
-
-
-
-
-
From fedora-directory-commits at redhat.com Mon Jul 9 20:10:12 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 9 Jul 2007 16:10:12 -0400
Subject: [Fedora-directory-commits]
admservconsole/src/com/netscape/management/admserv/logging
AccessLogViewerModel.java, 1.1.1.1,
1.2 ErrorLogViewerModel.java, 1.1.1.1, 1.2
Message-ID: <200707092010.l69KAC6O007171@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/logging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6902/src/com/netscape/management/admserv/logging
Modified Files:
AccessLogViewerModel.java ErrorLogViewerModel.java
Log Message:
Resolves: 247525
Summary: Fixed parameters passed to ReadLog CGI. Also some packaging/build changes for building RPMs as well as a version bump.
Index: AccessLogViewerModel.java
===================================================================
RCS file: /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- AccessLogViewerModel.java 22 May 2006 18:14:37 -0000 1.1.1.1
+++ AccessLogViewerModel.java 9 Jul 2007 20:10:10 -0000 1.2
@@ -70,8 +70,7 @@
try {
URL url = new URL(_url + "?op=read" + "&start=" +
rowStartIndex + "&stop=" +
- (rowStartIndex + numRows) + "&" +
- URLEncoder.encode("name=../../../../admin-serv/logs/access"));
+ (rowStartIndex + numRows) + "&name=access");
HttpManager _httpManager = new HttpManager();
AccessDataCommClient commClient =
new AccessDataCommClient(this, _username, _password);
@@ -101,8 +100,7 @@
_logLengthCalculating = true;
_logLengthAvailable = false;
_logLengthStringBuffer = new StringBuffer();
- URL url = new URL(_url + "?op=count" + "&" +
- URLEncoder.encode("name=../../../../admin-serv/logs/access"));
+ URL url = new URL(_url + "?op=count" + "&name=access");
HttpManager _httpManager = new HttpManager();
LogLengthCommClient commClient =
new AccessLogLengthCommClient(this, _username, _password);
Index: ErrorLogViewerModel.java
===================================================================
RCS file: /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ErrorLogViewerModel.java 22 May 2006 18:14:38 -0000 1.1.1.1
+++ ErrorLogViewerModel.java 9 Jul 2007 20:10:10 -0000 1.2
@@ -65,8 +65,7 @@
try {
URL url = new URL(_url + "?op=read" + "&start=" +
rowStartIndex + "&stop=" +
- (rowStartIndex + numRows) + "&" +
- URLEncoder.encode("name=../../../../admin-serv/logs/error"));
+ (rowStartIndex + numRows) + "&name=error");
HttpManager _httpManager = new HttpManager();
ErrorLogDataClient commClient =
new ErrorLogDataClient(_username, _password);
@@ -96,8 +95,7 @@
_logLengthCalculating = true;
_logLengthAvailable = false;
_logLengthStringBuffer = new StringBuffer();
- URL url = new URL(_url + "?op=count" + "&" +
- URLEncoder.encode("name=../../../../admin-serv/logs/error"));
+ URL url = new URL(_url + "?op=count" + "&name=error");
HttpManager _httpManager = new HttpManager();
LogLengthCommClient commClient =
new ErrorLogLengthCommClient(_username, _password);
From fedora-directory-commits at redhat.com Mon Jul 9 20:36:13 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 9 Jul 2007 16:36:13 -0400
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv DSUtil.java,
1.2, 1.3
Message-ID: <200707092036.l69KaDSY011494@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11428
Modified Files:
DSUtil.java
Log Message:
Resolves: ?
Summary: Removed an unused variable that was causing some confusion.
Index: DSUtil.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DSUtil.java 2 Jul 2007 19:44:08 -0000 1.2
+++ DSUtil.java 9 Jul 2007 20:36:11 -0000 1.3
@@ -2907,7 +2907,6 @@
private static Icon _warningIcon = null;
private static Icon _errorIcon = null;
public static final String AUTH_CHANGE_LISTENERS = "AuthChangeListeners";
- private static final String INSTANCE_ATTR = "nsslapd-instancedir";
private static final String SECURITY_ATTR = "nsslapd-security";
private static final String BAKDIR_ATTR = "nsslapd-bakdir";
private static final String DBDIR_ATTR = "nsslapd-directory";
From fedora-directory-commits at redhat.com Mon Jul 9 21:26:36 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Mon, 9 Jul 2007 17:26:36 -0400
Subject: [Fedora-directory-commits] coolkey Makefile.in,1.8,1.9
Message-ID: <200707092126.l69LQa70029975@cvs-int.fedora.redhat.com>
Author: rrelyea
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29768
Modified Files:
Makefile.in
Log Message:
Fix DIST in coolkey
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 16 Feb 2007 23:04:50 -0000 1.8
+++ Makefile.in 9 Jul 2007 21:26:33 -0000 1.9
@@ -220,7 +220,7 @@
target_vendor = @target_vendor@
SUBDIRS = src/libckyapplet src/coolkey $(am__append_1)
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = cookey.spec LICENSE
+EXTRA_DIST = coolkey.spec LICENSE
DISTCLEANFILES =
AUTOMAKE_OPTIONS = foreign
all: config.h
From fedora-directory-commits at redhat.com Wed Jul 11 01:14:07 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 10 Jul 2007 21:14:07 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src
create_instance.c, 1.62, 1.63
Message-ID: <200707110114.l6B1E7Dn008086@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8017/admin/src
Modified Files:
create_instance.c
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #6)
Description: adding nsslapd-instancedir to dse.ldif for ds_remove to find out
the instance dir path.
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- create_instance.c 29 Jun 2007 21:12:22 -0000 1.62
+++ create_instance.c 11 Jul 2007 01:14:05 -0000 1.63
@@ -2687,6 +2687,7 @@
fprintf(f, "nsslapd-tmpdir: %s\n", cf->tmp_dir);
fprintf(f, "nsslapd-certdir: %s\n", cf->cert_dir);
fprintf(f, "nsslapd-ldifdir: %s\n", cf->ldif_dir);
+ fprintf(f, "nsslapd-instancedir: %s\n", cf->inst_dir);
fprintf(f, "nsslapd-bakdir: %s\n", cf->bak_dir);
/* We use the system SASL by default on Linux, so we don't need to set sasl path */
if (NULL != cf->sasl_path) {
From fedora-directory-commits at redhat.com Wed Jul 11 01:14:08 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 10 Jul 2007 21:14:08 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd libglobs.c, 1.17,
1.18 proto-slap.h, 1.27, 1.28 slap.h, 1.22, 1.23
Message-ID: <200707110114.l6B1E804008094@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8017/servers/slapd
Modified Files:
libglobs.c proto-slap.h slap.h
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #6)
Description: adding nsslapd-instancedir to dse.ldif for ds_remove to find out
the instance dir path.
Index: libglobs.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libglobs.c 22 Jun 2007 21:54:58 -0000 1.17
+++ libglobs.c 11 Jul 2007 01:14:05 -0000 1.18
@@ -542,6 +542,9 @@
CONFIG_CONSTANT_STRING, NULL},
{CONFIG_HASH_FILTERS_ATTRIBUTE, config_set_hash_filters,
NULL, 0, NULL, CONFIG_ON_OFF, (ConfigGetFunc)config_get_hash_filters},
+ /* instance dir; used by admin tasks */
+ {CONFIG_INSTDIR_ATTRIBUTE, config_set_instancedir,
+ NULL, 0, NULL, CONFIG_STRING, NULL},
/* parameterizing schema dir */
{CONFIG_SCHEMADIR_ATTRIBUTE, config_set_schemadir,
NULL, 0,
@@ -4462,6 +4465,13 @@
return retVal;
}
+/* W/o the setter, "config_set: the attribute nsslapd-instancedir is read only" is printed out. */
+int
+config_set_instancedir(const char *attrname, char *value, char *errorbuf, int apply)
+{
+ return LDAP_SUCCESS;
+}
+
char *
config_get_schemadir()
{
Index: proto-slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- proto-slap.h 22 Jun 2007 21:54:58 -0000 1.27
+++ proto-slap.h 11 Jul 2007 01:14:05 -0000 1.28
@@ -316,6 +316,7 @@
int config_set_enquote_sup_oc(const char *attrname, char *value, char *errorbuf, int apply );
int config_set_basedn( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_configdir( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_instancedir( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_schemadir( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_lockdir( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_tmpdir( const char *attrname, char *value, char *errorbuf, int apply );
Index: slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- slap.h 22 Jun 2007 21:54:58 -0000 1.22
+++ slap.h 11 Jul 2007 01:14:05 -0000 1.23
@@ -1724,6 +1724,7 @@
#define CONFIG_REWRITE_RFC1274_ATTRIBUTE "nsslapd-rewrite-rfc1274"
#define CONFIG_CONFIG_ATTRIBUTE "nsslapd-config"
+#define CONFIG_INSTDIR_ATTRIBUTE "nsslapd-instancedir"
#define CONFIG_SCHEMADIR_ATTRIBUTE "nsslapd-schemadir"
#define CONFIG_LOCKDIR_ATTRIBUTE "nsslapd-lockdir"
#define CONFIG_TMPDIR_ATTRIBUTE "nsslapd-tmpdir"
From fedora-directory-commits at redhat.com Wed Jul 11 01:20:24 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 10 Jul 2007 21:20:24 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
AdminUtil.pm.in, 1.8, 1.9 adminserver.map.in, 1.5,
1.6 configdsroot.map.in, 1.4, 1.5 dirserver.map.in, 1.5,
1.6 register_param.map.in, 1.6, 1.7
Message-ID: <200707110120.l6B1KOs8008277@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8193/admserv/newinst/src
Modified Files:
AdminUtil.pm.in adminserver.map.in configdsroot.map.in
dirserver.map.in register_param.map.in
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #7)
Description: adding Perl version of ds_remove
Index: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AdminUtil.pm.in 4 Jul 2007 01:31:33 -0000 1.8
+++ AdminUtil.pm.in 11 Jul 2007 01:20:21 -0000 1.9
@@ -42,11 +42,13 @@
@EXPORT = qw(getAdmConf getConfigDSConn createConfigDS createSubDS
updateAdmConf updateAdmpw updateLocalConf importCACert
getLocalConfigDS getPset registerDSWithConfigDS
- registerManyDSWithConfigDS createSubDSNoConn);
+ registerManyDSWithConfigDS createSubDSNoConn
+ unregisterDSWithConfigDS);
@EXPORT_OK = qw(getAdmConf getConfigDSConn createConfigDS createSubDS
updateAdmConf updateAdmpw updateLocalConf importCACert
getLocalConfigDS getPset registerDSWithConfigDS
- registerManyDSWithConfigDS createSubDSNoConn);
+ registerManyDSWithConfigDS createSubDSNoConn
+ unregisterDSWithConfigDS);
# load perldap
use Mozilla::LDAP::Conn;
@@ -633,6 +635,32 @@
my $conn = shift;
my $admConf = shift;
my $configdir = shift || "@instconfigdir@";
+
+ my $rc = registerDSWithConfigDSExt(1, $servid, $errs, $inf,
+ $conn, $admConf, $configdir);
+ return $rc;
+}
+
+sub unregisterDSWithConfigDS {
+ my $servid = shift;
+ my $errs = shift;
+ my $inf = shift;
+ my $conn = shift;
+ my $admConf = shift;
+ my $configdir = shift || "@instconfigdir@";
+ my $rc = registerDSWithConfigDSExt(0, $servid, $errs, $inf,
+ $conn, $admConf, $configdir);
+ return $rc;
+}
+
+sub registerDSWithConfigDSExt {
+ my $isRegister = shift;
+ my $servid = shift;
+ my $errs = shift;
+ my $inf = shift;
+ my $conn = shift;
+ my $admConf = shift;
+ my $configdir = shift || "@instconfigdir@";
my $inst;
my $needclose;
@@ -682,10 +710,19 @@
}
}
- # add the Admin Server configuration entries
- my @ldiffiles = ("@ldifdir@/10dsdata.ldif.tmpl",
- "@ldifdir@/11dstasks.ldif.tmpl"
+ my @ldiffiles = ();
+ if ($isRegister)
+ {
+ # add the Admin Server configuration entries
+ @ldiffiles = ("@ldifdir@/10dsdata.ldif.tmpl",
+ "@ldifdir@/11dstasks.ldif.tmpl"
);
+ }
+ else
+ {
+ # remove the Admin Server configuration entries
+ @ldiffiles = ("@ldifdir@/10rm_dsdata.ldif.tmpl");
+ }
my $setupinf = new Inf("@infdir@/setup.inf");
my $slapdinf = new Inf("@infdir@/slapd.inf");
@@ -708,4 +745,3 @@
return @{$errs} ? 0 : 1;
}
-
Index: adminserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/adminserver.map.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- adminserver.map.in 6 Jul 2007 18:06:19 -0000 1.5
+++ adminserver.map.in 11 Jul 2007 01:20:21 -0000 1.6
@@ -48,6 +48,9 @@
# * If the right-hand value is in " (doublequote), the value is passed as is.
# * If the right-hand value is not in any quote, the value should be found
# in either of the setup inf file (static) or the install inf file (dynamic).
+# * The right-hand value could have the format Key:"default_value".
+# In this case, Key is searched in the inf files first.
+# If the Key is not found, the default_value is set.
# * Variables surrounded by @ (e.g., @configdir@) are replaced with the
# system path at the compile time.
# * The right-hand value can contain variables surrounded by % (e.g., %asid%)
Index: configdsroot.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/configdsroot.map.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configdsroot.map.in 25 Jun 2007 18:23:53 -0000 1.4
+++ configdsroot.map.in 11 Jul 2007 01:20:21 -0000 1.5
@@ -45,6 +45,9 @@
# * If the right-hand value is in " (doublequote), the value is passed as is.
# * If the right-hand value is not in any quote, the value should be found
# in either of the setup inf file (static) or the install inf file (dynamic).
+# * The right-hand value could have the format Key:"default_value".
+# In this case, Key is searched in the inf files first.
+# If the Key is not found, the default_value is set.
# * Variables surrounded by @ (e.g., @configdir@) are replaced with the
# system path at the compile time.
# * The right-hand value can contain variables surrounded by % (e.g., %asid%)
@@ -66,7 +69,7 @@
ds_version = Version
ds_baseversion = BaseVersion
ds_port = ServerPort
-ds_secure_port = "636"
+ds_secure_port = SecureServerPort:"636"
ds_suffix = Suffix
dsid = ServerIdentifier
Index: dirserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/dirserver.map.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dirserver.map.in 28 Jun 2007 16:24:41 -0000 1.5
+++ dirserver.map.in 11 Jul 2007 01:20:21 -0000 1.6
@@ -48,6 +48,9 @@
# * If the right-hand value is in " (doublequote), the value is passed as is.
# * If the right-hand value is not in any quote, the value should be found
# in either of the setup inf file (static) or the install inf file (dynamic).
+# * The right-hand value could have the format Key:"default_value".
+# In this case, Key is searched in the inf files first.
+# If the Key is not found, the default_value is set.
# * Variables surrounded by @ (e.g., @configdir@) are replaced with the
# system path at the compile time.
# * The right-hand value can contain variables surrounded by % (e.g., %asid%)
@@ -67,7 +70,7 @@
dsid = ServerIdentifier
ds_user = SuiteSpotUserID
ds_port = ServerPort
-ds_secure_port = "636"
+ds_secure_port = SecureServerPort:"636"
rootdn = RootDN
ds_suffix = Suffix
ds_buildnum = BuildNumber
Index: register_param.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- register_param.map.in 6 Jul 2007 18:06:19 -0000 1.6
+++ register_param.map.in 11 Jul 2007 01:20:21 -0000 1.7
@@ -48,6 +48,9 @@
# * If the right-hand value is in " (doublequote), the value is passed as is.
# * If the right-hand value is not in any quote, the value should be found
# in either of the setup inf file (static) or the install inf file (dynamic).
+# * The right-hand value could have the format Key:"default_value".
+# In this case, Key is searched in the inf files first.
+# If the Key is not found, the default_value is set.
# * Variables surrounded by @ (e.g., @configdir@) are replaced with the
# system path at the compile time.
# * The right-hand value can contain variables surrounded by % (e.g., %asid%)
@@ -84,7 +87,7 @@
dsid = ServerIdentifier
ds_user = SuiteSpotUserID
ds_port = ServerPort
-ds_secure_port = "636"
+ds_secure_port = SecureServerPort:"636"
rootdn = RootDN
ds_suffix = Suffix
ds_buildnum = BuildNumber
From fedora-directory-commits at redhat.com Wed Jul 11 01:20:23 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 10 Jul 2007 21:20:23 -0400
Subject: [Fedora-directory-commits] adminserver Makefile.am, 1.22,
1.23 Makefile.in, 1.22, 1.23 aclocal.m4, 1.17, 1.18 configure,
1.20, 1.21
Message-ID: <200707110120.l6B1KNMt008266@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8193
Modified Files:
Makefile.am Makefile.in aclocal.m4 configure
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #7)
Description: adding Perl version of ds_remove
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.am 4 Jul 2007 01:31:32 -0000 1.22
+++ Makefile.am 11 Jul 2007 01:20:21 -0000 1.23
@@ -136,6 +136,7 @@
admserv/schema/ldif/01nsroot.ldif.tmpl \
admserv/schema/ldif/02globalpreferences.ldif.tmpl \
admserv/schema/ldif/10dsdata.ldif.tmpl \
+ admserv/schema/ldif/10rm_dsdata.ldif.tmpl \
admserv/schema/ldif/11dstasks.ldif.tmpl \
admserv/schema/ldif/12dsconfig.mod.tmpl \
admserv/schema/ldif/13dsschema.mod.tmpl \
@@ -158,10 +159,10 @@
config statpingserv viewdata dsconfig monreplication restartsrv \
statusping viewlog htmladmin sec-activate stopsrv download help \
ds_start ds_restart ds_shutdown ds_ldif2db ds_db2ldif ds_bak2db \
- ds_db2bak ds_listdb ds_rmdb ds_remove ds_snmpctrl ds_vlvindex ds_addindex
+ ds_db2bak ds_listdb ds_rmdb ds_snmpctrl ds_vlvindex ds_addindex
bin_SCRIPTS = admserv/newinst/src/register_server.pl
-cgibin_SCRIPTS = admserv/cgi-src40/ds_create
+cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove
nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \
@@ -294,11 +295,6 @@
ds_rmdb_LDADD = libdsa.a $(DEFAULT_LIBS)
ds_rmdb_LINK = $(MYLINK)
-ds_remove_SOURCES = admserv/cgi-ds/ds_remove.c admserv/cgi-ds/init_ds_env.c
-ds_remove_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_remove_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_remove_LINK = $(MYLINK)
-
ds_snmpctrl_SOURCES = admserv/cgi-ds/ds_snmpctrl.c admserv/cgi-ds/init_ds_env.c
ds_snmpctrl_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_snmpctrl_LDADD = libdsa.a $(DEFAULT_LIBS)
@@ -374,7 +370,8 @@
# regular property files go here
property_DATA = admserv/newinst/src/setup-ds-admin.res \
admserv/newinst/src/migrate-ds-admin.res \
- admserv/cgi-src40/ds_create.res
+ admserv/cgi-src40/ds_create.res \
+ admserv/cgi-src40/ds_remove.res
# French resource bundles (for the French localization in the future)
#RESOURCE_BUNDLES_FR = foo_fr.res
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.in 4 Jul 2007 01:31:32 -0000 1.22
+++ Makefile.in 11 Jul 2007 01:20:21 -0000 1.23
@@ -51,8 +51,8 @@
help$(EXEEXT) ds_start$(EXEEXT) ds_restart$(EXEEXT) \
ds_shutdown$(EXEEXT) ds_ldif2db$(EXEEXT) ds_db2ldif$(EXEEXT) \
ds_bak2db$(EXEEXT) ds_db2bak$(EXEEXT) ds_listdb$(EXEEXT) \
- ds_rmdb$(EXEEXT) ds_remove$(EXEEXT) ds_snmpctrl$(EXEEXT) \
- ds_vlvindex$(EXEEXT) ds_addindex$(EXEEXT)
+ ds_rmdb$(EXEEXT) ds_snmpctrl$(EXEEXT) ds_vlvindex$(EXEEXT) \
+ ds_addindex$(EXEEXT)
DIST_COMMON = README $(am__configure_deps) $(dist_help_DATA) \
$(dist_html_DATA) $(dist_icon_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -167,10 +167,6 @@
admserv/cgi-ds/ds_listdb-init_ds_env.$(OBJEXT)
ds_listdb_OBJECTS = $(am_ds_listdb_OBJECTS)
ds_listdb_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2)
-am_ds_remove_OBJECTS = admserv/cgi-ds/ds_remove-ds_remove.$(OBJEXT) \
- admserv/cgi-ds/ds_remove-init_ds_env.$(OBJEXT)
-ds_remove_OBJECTS = $(am_ds_remove_OBJECTS)
-ds_remove_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2)
am_ds_restart_OBJECTS = admserv/cgi-ds/ds_restart-restart.$(OBJEXT) \
admserv/cgi-ds/ds_restart-init_ds_env.$(OBJEXT)
ds_restart_OBJECTS = $(am_ds_restart_OBJECTS)
@@ -274,8 +270,7 @@
$(download_SOURCES) $(ds_addindex_SOURCES) \
$(ds_bak2db_SOURCES) $(ds_db2bak_SOURCES) \
$(ds_db2ldif_SOURCES) $(ds_ldif2db_SOURCES) \
- $(ds_listdb_SOURCES) $(ds_remove_SOURCES) \
- $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \
+ $(ds_listdb_SOURCES) $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \
$(ds_shutdown_SOURCES) $(ds_snmpctrl_SOURCES) \
$(ds_start_SOURCES) $(ds_vlvindex_SOURCES) $(dsconfig_SOURCES) \
$(help_SOURCES) $(htmladmin_SOURCES) $(monreplication_SOURCES) \
@@ -289,8 +284,7 @@
$(download_SOURCES) $(ds_addindex_SOURCES) \
$(ds_bak2db_SOURCES) $(ds_db2bak_SOURCES) \
$(ds_db2ldif_SOURCES) $(ds_ldif2db_SOURCES) \
- $(ds_listdb_SOURCES) $(ds_remove_SOURCES) \
- $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \
+ $(ds_listdb_SOURCES) $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \
$(ds_shutdown_SOURCES) $(ds_snmpctrl_SOURCES) \
$(ds_start_SOURCES) $(ds_vlvindex_SOURCES) $(dsconfig_SOURCES) \
$(help_SOURCES) $(htmladmin_SOURCES) $(monreplication_SOURCES) \
@@ -401,7 +395,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -576,6 +569,7 @@
admserv/schema/ldif/01nsroot.ldif.tmpl \
admserv/schema/ldif/02globalpreferences.ldif.tmpl \
admserv/schema/ldif/10dsdata.ldif.tmpl \
+ admserv/schema/ldif/10rm_dsdata.ldif.tmpl \
admserv/schema/ldif/11dstasks.ldif.tmpl \
admserv/schema/ldif/12dsconfig.mod.tmpl \
admserv/schema/ldif/13dsschema.mod.tmpl \
@@ -595,7 +589,7 @@
admserv/newinst/src/asmigrate.map
bin_SCRIPTS = admserv/newinst/src/register_server.pl
-cgibin_SCRIPTS = admserv/cgi-src40/ds_create
+cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove
nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \
admserv/newinst/src/migrate-ds-admin.pl
@@ -715,10 +709,6 @@
ds_rmdb_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_rmdb_LDADD = libdsa.a $(DEFAULT_LIBS)
ds_rmdb_LINK = $(MYLINK)
-ds_remove_SOURCES = admserv/cgi-ds/ds_remove.c admserv/cgi-ds/init_ds_env.c
-ds_remove_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_remove_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_remove_LINK = $(MYLINK)
ds_snmpctrl_SOURCES = admserv/cgi-ds/ds_snmpctrl.c admserv/cgi-ds/init_ds_env.c
ds_snmpctrl_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_snmpctrl_LDADD = libdsa.a $(DEFAULT_LIBS)
@@ -785,7 +775,8 @@
# regular property files go here
property_DATA = admserv/newinst/src/setup-ds-admin.res \
admserv/newinst/src/migrate-ds-admin.res \
- admserv/cgi-src40/ds_create.res
+ admserv/cgi-src40/ds_create.res \
+ admserv/cgi-src40/ds_remove.res
# these are for the config files and scripts that we need to generate and replace
@@ -1144,15 +1135,6 @@
ds_listdb$(EXEEXT): $(ds_listdb_OBJECTS) $(ds_listdb_DEPENDENCIES)
@rm -f ds_listdb$(EXEEXT)
$(ds_listdb_LINK) $(ds_listdb_LDFLAGS) $(ds_listdb_OBJECTS) $(ds_listdb_LDADD) $(LIBS)
-admserv/cgi-ds/ds_remove-ds_remove.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-admserv/cgi-ds/ds_remove-init_ds_env.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-ds_remove$(EXEEXT): $(ds_remove_OBJECTS) $(ds_remove_DEPENDENCIES)
- @rm -f ds_remove$(EXEEXT)
- $(ds_remove_LINK) $(ds_remove_LDFLAGS) $(ds_remove_OBJECTS) $(ds_remove_LDADD) $(LIBS)
admserv/cgi-ds/ds_restart-restart.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1419,8 +1401,6 @@
-rm -f admserv/cgi-ds/ds_ldif2db-init_ds_env.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_listdb-ds_listdb.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_listdb-init_ds_env.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_remove-ds_remove.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_remove-init_ds_env.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_restart-init_ds_env.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_restart-restart.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_rmdb-ds_rmdb.$(OBJEXT)
@@ -1517,8 +1497,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-init_ds_env.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at admserv/cgi-ds/$(DEPDIR)/ds_listdb-ds_listdb.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at admserv/cgi-ds/$(DEPDIR)/ds_listdb-init_ds_env.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at admserv/cgi-ds/$(DEPDIR)/ds_restart-init_ds_env.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at admserv/cgi-ds/$(DEPDIR)/ds_rmdb-ds_rmdb.Po at am__quote@
@@ -1941,34 +1919,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_listdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_listdb-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-admserv/cgi-ds/ds_remove-ds_remove.o: admserv/cgi-ds/ds_remove.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_remove-ds_remove.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo" -c -o admserv/cgi-ds/ds_remove-ds_remove.o `test -f 'admserv/cgi-ds/ds_remove.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_remove.c; \
- at am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_remove.c' object='admserv/cgi-ds/ds_remove-ds_remove.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_remove-ds_remove.o `test -f 'admserv/cgi-ds/ds_remove.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_remove.c
-
-admserv/cgi-ds/ds_remove-ds_remove.obj: admserv/cgi-ds/ds_remove.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_remove-ds_remove.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo" -c -o admserv/cgi-ds/ds_remove-ds_remove.obj `if test -f 'admserv/cgi-ds/ds_remove.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_remove.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_remove.c'; fi`; \
- at am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_remove.c' object='admserv/cgi-ds/ds_remove-ds_remove.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_remove-ds_remove.obj `if test -f 'admserv/cgi-ds/ds_remove.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_remove.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_remove.c'; fi`
-
-admserv/cgi-ds/ds_remove-init_ds_env.o: admserv/cgi-ds/init_ds_env.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_remove-init_ds_env.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_remove-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c; \
- at am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_remove-init_ds_env.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_remove-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c
-
-admserv/cgi-ds/ds_remove-init_ds_env.obj: admserv/cgi-ds/init_ds_env.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_remove-init_ds_env.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_remove-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`; \
- at am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_remove-init_ds_env.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_remove-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-
admserv/cgi-ds/ds_restart-restart.o: admserv/cgi-ds/restart.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_restart_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_restart-restart.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Tpo" -c -o admserv/cgi-ds/ds_restart-restart.o `test -f 'admserv/cgi-ds/restart.c' || echo '$(srcdir)/'`admserv/cgi-ds/restart.c; \
@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Tpo"; exit 1; fi
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/aclocal.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- aclocal.m4 4 Jul 2007 01:31:32 -0000 1.17
+++ aclocal.m4 11 Jul 2007 01:20:21 -0000 1.18
@@ -1578,27 +1578,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -4305,9 +4288,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4441,11 +4421,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4457,7 +4437,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4537,7 +4517,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6373,7 +6353,6 @@
done
done
done
-IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6406,7 +6385,6 @@
done
])
SED=$lt_cv_path_SED
-AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- configure 4 Jul 2007 01:31:32 -0000 1.20
+++ configure 11 Jul 2007 01:20:21 -0000 1.21
@@ -468,7 +468,7 @@
ac_default_prefix=/opt/fedora-ds
ac_subdirs_all="$ac_subdirs_all mod_admserv"
ac_subdirs_all="$ac_subdirs_all mod_restartd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -3832,7 +3832,6 @@
done
done
done
-IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3867,7 +3866,6 @@
fi
SED=$lt_cv_path_SED
-
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -4308,7 +4306,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4311 "configure"' > conftest.$ac_ext
+ echo '#line 4309 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5443,7 +5441,7 @@
# Provide some information about the compiler.
-echo "$as_me:5446:" \
+echo "$as_me:5444:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6506,11 +6504,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6509: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6507: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6513: \$? = $ac_status" >&5
+ echo "$as_me:6511: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6774,11 +6772,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6777: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6775: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6781: \$? = $ac_status" >&5
+ echo "$as_me:6779: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6878,11 +6876,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6881: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6879: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6885: \$? = $ac_status" >&5
+ echo "$as_me:6883: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8343,31 +8341,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 8350 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9244,7 +9221,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11664: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11694: \$? = $ac_status" >&5
+ echo "$as_me:11668: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11791,11 +11765,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11794: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11768: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11798: \$? = $ac_status" >&5
+ echo "$as_me:11772: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12323,31 +12297,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 12330 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12731,9 +12684,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -12867,11 +12817,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_CXX
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_CXX
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -12883,7 +12833,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12963,7 +12913,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13385,11 +13335,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13388: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13338: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13392: \$? = $ac_status" >&5
+ echo "$as_me:13342: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13489,11 +13439,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13492: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13442: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13496: \$? = $ac_status" >&5
+ echo "$as_me:13446: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14934,31 +14884,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 14941 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15342,9 +15271,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -15478,11 +15404,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_F77
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_F77
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -15494,7 +15420,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -15574,7 +15500,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15716,11 +15642,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15719: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15645: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15723: \$? = $ac_status" >&5
+ echo "$as_me:15649: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15984,11 +15910,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15987: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15913: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15991: \$? = $ac_status" >&5
+ echo "$as_me:15917: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16088,11 +16014,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16091: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16017: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16095: \$? = $ac_status" >&5
+ echo "$as_me:16021: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17553,31 +17479,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 17560 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17961,9 +17866,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18097,11 +17999,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_GCJ
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_GCJ
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18113,7 +18015,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18193,7 +18095,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18445,9 +18347,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18581,11 +18480,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_RC
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_RC
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18597,7 +18496,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18677,7 +18576,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -25945,7 +25844,6 @@
s, at CCDEPMODE@,$CCDEPMODE,;t t
s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s, at SED@,$SED,;t t
s, at EGREP@,$EGREP,;t t
s, at LN_S@,$LN_S,;t t
s, at ECHO@,$ECHO,;t t
From fedora-directory-commits at redhat.com Wed Jul 11 01:20:24 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 10 Jul 2007 21:20:24 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/schema/ldif
10rm_dsdata.ldif.tmpl, 1.1, 1.2
Message-ID: <200707110120.l6B1KOTE008285@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8193/admserv/schema/ldif
Modified Files:
10rm_dsdata.ldif.tmpl
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #7)
Description: adding Perl version of ds_remove
Index: 10rm_dsdata.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/10rm_dsdata.ldif.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 10rm_dsdata.ldif.tmpl 6 Jul 2007 17:41:18 -0000 1.1
+++ 10rm_dsdata.ldif.tmpl 11 Jul 2007 01:20:22 -0000 1.2
@@ -30,8 +30,5 @@
dn: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
changetype: delete
-dn: cn=configuration,cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-changetype: delete
-
dn: ou="cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot",ou=UserPreferences, ou=%domain%, o=NetscapeRoot
changetype: delete
From fedora-directory-commits at redhat.com Wed Jul 11 01:20:24 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 10 Jul 2007 21:20:24 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40
ds_remove.in, NONE, 1.1 ds_remove.res, NONE, 1.1
Message-ID: <200707110120.l6B1KOXD008290@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8193/admserv/cgi-src40
Added Files:
ds_remove.in ds_remove.res
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #7)
Description: adding Perl version of ds_remove
--- NEW FILE ds_remove.in ---
#!/usr/bin/env perl
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
use lib '@perldir@';
use strict;
use File::Basename;
use File::Path;
use CGI qw(:cgi :oldstyle_urls);
use Inf;
use AdminUtil;
use Util;
use FileConn;
use Resource;
sub remove_tree
{
my $centry = shift;
my $key = shift;
my $instname = shift;
my $isparent = shift;
foreach my $path ( @{$centry->{$key}} )
{
my $rmdir = "";
if ( 1 == $isparent )
{
$rmdir = dirname($path);
}
else
{
$rmdir = $path;
}
if ( -d $rmdir && $rmdir =~ /$instname/ )
{
my $rc = rmtree($rmdir);
print STDERR "rmtree: $rmdir => RC: $rc\n";
}
}
}
sub remove_pidfile
{
my ($type, $instdir, $instname) = @_;
my $pattern = "^" . $type . ".*=";
my $pidline = `grep $pattern $instdir/start-slapd`;
chomp($pidline);
my ($key, $pidfile) = split(/=/, $pidline);
if ( -e $pidfile && $pidfile =~ /$instname/ )
{
unlink($pidfile);
}
}
my $res = new Resource("@propertydir@/ds_remove.res",
"@propertydir@/setup-ds-admin.res",
"@propertydir@/setup-ds.res");
# parse the input parameters
my $query = new CGI;
# call ds_newinst as a GET (GET or POST works, GET is simpler)
$ENV{REQUEST_METHOD} = "GET";
$ENV{QUERY_STRING} = $query->query_string();
my $instname = $query->param('InstanceName');
my ($slapd, $inst) = split(/-/, $instname, 2);
my @errs;
my $inf = createInfFromConfig("@instconfigdir@/slapd-$inst", $inst, \@errs);
if (@errs) {
print "Content-type: text/html\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
exit 1;
}
# add the parmeters necessary to configure this DS to be managed
# by the console and to be registered with the config DS - these
# are usually passed in via the CGI params, or use reasonable
# default values
my $admConf = getAdmConf("@instconfigdir@/admin-serv");
$inf->{General}->{ConfigDirectoryLdapURL} = $query->param('ldap_url') ||
$admConf->{ldapurl};
$inf->{General}->{AdminDomain} = $query->param('admin_domain') ||
$admConf->{AdminDomain};
# read the config file to find out the paths
my $dseldif = "@instconfigdir@/$instname/dse.ldif";
my $conn = new FileConn($dseldif);
my $dn = "cn=config";
my $entry = $conn->search($dn, "base", "(cn=*)", 0);
if (!$entry) {
print "Content-type: text/html\n\n";
print "NMC_ErrInfo: Search $dn in $dseldif failed: $entry\n";
print "NMC_Status: 1\n";
exit 1;
}
# stop the server first
my $instdir = "";
foreach my $path ( @{$entry->{"nsslapd-instancedir"}} )
{
if ( -d $path )
{
my $prog = $path . "/stop-slapd";
if (-x $prog) {
$? = 0;
# run the CGI
my $output = `$prog 2>&1`;
my $status = $?;
if ($status) {
# Ignore the stop failure
print "Content-type: text/html\n\n";
print "NMC_ErrInfo: Could not stop directory server: $output\n";
}
$instdir = $path; # need to use it later...
} else {
print "Content-type: text/html\n\n";
print "NMC_ErrInfo: The program $prog does not exist\n";
print "NMC_Status: 1\n";
exit 1;
}
}
}
# Unregister the server from the configuration ds
# get config ds url from input or admconf
# get admin id from input or admconf
# must get admin password from input (PASSWORD_PIPE?)
# get admin domain
# config ds info
if (!unregisterDSWithConfigDS($inst, \@errs, $inf)) {
print "Content-type: text/html\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
exit 1;
}
# remove physical dirs/files
$dn = "cn=config,cn=ldbm database,cn=plugins,cn=config";
my $dbentry = $conn->search($dn, "base", "(cn=*)", 0);
if (!$dbentry) {
print "Content-type: text/html\n\n";
print "NMC_ErrInfo: Search $dn in $dseldif failed: $dbentry\n";
print "NMC_Status: 1\n";
exit 1;
}
remove_tree($dbentry, "nsslapd-directory", $instname, 1);
remove_tree($dbentry, "nsslapd-db-logdirectory", $instname, 1);
remove_tree($entry, "nsslapd-lockdir", $instname);
remove_tree($entry, "nsslapd-tmpdir", $instname);
remove_tree($entry, "nsslapd-bakdir", $instname, 1);
remove_tree($entry, "nsslapd-errorlog", $instname, 1);
remove_tree($entry, "nsslapd-schemadir", $instname, 1);
# instance dir
if ( -d $instdir )
{
# clean up pid files (if any)
remove_pidfile("STARTPIDFILE", $instdir, $instname);
remove_pidfile("PIDFILE", $instdir, $instname);
my $rc = rmtree($instdir);
}
# if we got here, report success
print "Content-type: text/html\n\n";
print "NMC_Status: 0\n";
exit 0;
--- NEW FILE ds_remove.res ---
# resources for ds_remove
From fedora-directory-commits at redhat.com Wed Jul 11 01:26:26 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 10 Jul 2007 21:26:26 -0400
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv DSAdmin.java,
1.4, 1.5
Message-ID: <200707110126.l6B1QQ5k008472@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8374/src/com/netscape/admin/dirserv
Modified Files:
DSAdmin.java
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #16)
Description: if searching sieDN returns NO_SUCH_OBJECT, skips the remove
operation and shows "Success!" dialog.
Index: DSAdmin.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DSAdmin.java 2 Jul 2007 19:44:08 -0000 1.4
+++ DSAdmin.java 11 Jul 2007 01:26:23 -0000 1.5
@@ -986,15 +986,25 @@
LDAPEntry sieEntry = null;
try {
sieEntry = ldc.read( sieDN, attrs );
- } catch (Exception ex ) {
- Debug.println( "DSAdmin:removeServer <" + sieDN + "> " + ex);
+ } catch ( LDAPException ex ) {
+ Debug.println("DSAdmin:removeServer <" + sieDN + "> " + ex);
+ // Ignore the no such object error; sieEntry is already removed
+ if ( ex.getLDAPResultCode() == ex.NO_SUCH_OBJECT ) {
+ status = true;
+ } else {
+ args[1] = ex.toString();
+ DSUtil.showErrorDialog(frame, "removeinstance", args);
+ _removed = false; // problem reading sieEntry
+ return false;
+ }
+ } catch ( Exception ex ) {
+ Debug.println("DSAdmin:removeServer <" + sieDN + "> " + ex);
args[1] = ex.toString();
- DSUtil.showErrorDialog(frame, "removeinstance",
- args);
- _removed = false; // remove failed
+ DSUtil.showErrorDialog(frame, "removeinstance", args);
+ _removed = false; // problem reading sieEntry
return false;
}
- if (sieEntry != null ) {
+ if ( sieEntry != null ) {
try {
status = delete_sieTree(sieEntry );
} catch (Exception ex ) {
@@ -1009,7 +1019,7 @@
// Now we need to remove the reference of this server
status = remove_serverInstance(sieDN);
}
- if ( status == false) {
+ if ( status == false ) {
args[1] = "";
DSUtil.showErrorDialog(frame, "removesie",
args);
From fedora-directory-commits at redhat.com Wed Jul 11 21:29:09 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 11 Jul 2007 17:29:09 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd ava.c, 1.6, 1.7
Message-ID: <200707112129.l6BLT9Xs031218@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30667
Modified Files:
ava.c
Log Message:
Resolves: #247725
Summary: rhds71 Invalid LDIF Syntax crashes directory server (comment #18)
Description: The problem was if an RDN ends with '\\', strcpy_special_undo
did not check if there is no more character, and incremented the pointer
beyond the end and accessed the address.
Index: ava.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ava.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ava.c 10 Nov 2006 23:45:40 -0000 1.6
+++ ava.c 11 Jul 2007 21:29:06 -0000 1.7
@@ -113,7 +113,7 @@
strcpy_special_undo( char *d, const char *s )
{
const char *end = s + strlen(s);
- for ( ; *s; s++ )
+ for ( ; s < end && *s; s++ )
{
switch ( *s )
{
From fedora-directory-commits at redhat.com Wed Jul 11 21:36:49 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 11 Jul 2007 17:36:49 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40
ds_create.in, 1.1, 1.2 ds_remove.in, 1.1, 1.2
Message-ID: <200707112136.l6BLanxn001252@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1046
Modified Files:
ds_create.in ds_remove.in
Log Message:
Resolves: #246683
Summary: Reimplement ds_create without setuputil code (comment #16)
Description: adding 'print "Content-type: text/plain\n\n";' to each output.
Index: ds_create.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_create.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds_create.in 4 Jul 2007 01:31:33 -0000 1.1
+++ ds_create.in 11 Jul 2007 21:36:47 -0000 1.2
@@ -75,6 +75,7 @@
my $status = $?;
# check for and report errors
if ($status) {
+ print "Content-type: text/plain\n\n";
print $output;
exit $status;
}
@@ -92,6 +93,7 @@
my @errs;
my $inf = createInfFromConfig("@instconfigdir@/slapd-$inst", $inst, \@errs);
if (@errs) {
+ print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
exit 1;
@@ -110,6 +112,7 @@
$admConf->{AdminDomain};
if (!createSubDSNoConn($inf, \@errs)) {
+ print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
exit 1;
@@ -127,11 +130,13 @@
my $output = `$prog 2>&1`;
my $status = $?;
if ($status) {
+ print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: Could not start directory server: $output\n";
print "NMC_Status: $status\n";
exit $status;
}
} else {
+ print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: The program $prog does not exist\n";
print "NMC_Status: 1\n";
exit 1;
@@ -146,11 +151,13 @@
# config ds info
if (!registerDSWithConfigDS($servid, \@errs, $inf)) {
+ print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
exit 1;
}
# if we got here, report success
+print "Content-type: text/plain\n\n";
print "NMC_Status: 0\n";
exit 0;
Index: ds_remove.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_remove.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds_remove.in 11 Jul 2007 01:20:22 -0000 1.1
+++ ds_remove.in 11 Jul 2007 21:36:47 -0000 1.2
@@ -106,7 +106,7 @@
my @errs;
my $inf = createInfFromConfig("@instconfigdir@/slapd-$inst", $inst, \@errs);
if (@errs) {
- print "Content-type: text/html\n\n";
+ print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
exit 1;
@@ -129,7 +129,7 @@
my $dn = "cn=config";
my $entry = $conn->search($dn, "base", "(cn=*)", 0);
if (!$entry) {
- print "Content-type: text/html\n\n";
+ print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: Search $dn in $dseldif failed: $entry\n";
print "NMC_Status: 1\n";
exit 1;
@@ -149,12 +149,12 @@
my $status = $?;
if ($status) {
# Ignore the stop failure
- print "Content-type: text/html\n\n";
+ print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: Could not stop directory server: $output\n";
}
$instdir = $path; # need to use it later...
} else {
- print "Content-type: text/html\n\n";
+ print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: The program $prog does not exist\n";
print "NMC_Status: 1\n";
exit 1;
@@ -169,7 +169,7 @@
# get admin domain
# config ds info
if (!unregisterDSWithConfigDS($inst, \@errs, $inf)) {
- print "Content-type: text/html\n\n";
+ print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
exit 1;
@@ -179,7 +179,7 @@
$dn = "cn=config,cn=ldbm database,cn=plugins,cn=config";
my $dbentry = $conn->search($dn, "base", "(cn=*)", 0);
if (!$dbentry) {
- print "Content-type: text/html\n\n";
+ print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: Search $dn in $dseldif failed: $dbentry\n";
print "NMC_Status: 1\n";
exit 1;
@@ -203,6 +203,6 @@
}
# if we got here, report success
-print "Content-type: text/html\n\n";
+print "Content-type: text/plain\n\n";
print "NMC_Status: 0\n";
exit 0;
From fedora-directory-commits at redhat.com Thu Jul 12 13:52:44 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 12 Jul 2007 09:52:44 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
DSDialogs.pm, 1.2, 1.3 DSMigration.pm.in, 1.2, 1.3 FileConn.pm,
1.1, 1.2 Migration.pm.in, 1.1, 1.2 Util.pm.in, 1.6,
1.7 migrate-ds.res, 1.1, 1.2 setup-ds.pl.in, 1.4,
1.5 setup-ds.res.in, 1.6, 1.7
Message-ID: <200707121352.l6CDqiRn010746@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10721/ldap/admin/src/scripts
Modified Files:
DSDialogs.pm DSMigration.pm.in FileConn.pm Migration.pm.in
Util.pm.in migrate-ds.res setup-ds.pl.in setup-ds.res.in
Log Message:
Resolves: bug 245815
Bug Description: DS Admin Migration framework - cross platform support
Reviewed by: nhosoi (Thanks!)
Fix Description: There are basically three parts to cross platform support
1) Allow a different physical server root than the logical server root. This allows you to copy the old server root directory to the target machine, either by making a tarball or by a network mount. Then you can migrate from e.g. /mnt/opt/fedora-ds, and specify that the real old server root was /opt/fedora-ds. This is the distinction between the --oldsroot and --actualsroot parameters.
2) Cross platform database migration requires the old data is converted to LDIF first. Migration makes the simplifying assumption that the database LDIF file is in the old db directory and has the name of .ldif e.g. userRoot.ldif
3) Cross platform replication migration doesn't preserve the state, so the changelog nor other associated state information can be migrated.
I rewrote the old migration script to use the FileConn - this theoretically will allow us to support migration using an LDAP::Conn as well.
I had to make some fixes to FileConn, primarily to support the root DSE.
Platforms tested: RHEL4
Flag Day: no
Doc impact: Yes, along with the rest of the new migration framework.
Index: DSDialogs.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSDialogs.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DSDialogs.pm 19 Jun 2007 23:05:08 -0000 1.2
+++ DSDialogs.pm 12 Jul 2007 13:52:42 -0000 1.3
@@ -98,7 +98,7 @@
my $ans = shift;
my $res = $DialogManager::SAME;
my $path = $self->{manager}->{setup}->{configdir} . "/slapd-" . $ans;
- if ($ans !~ /^[0-9a-zA-Z_-]+$/) {
+ if (!isValidServerID($ans)) {
$self->{manager}->alert("dialog_dsserverid_error", $ans);
} elsif (-d $path) {
$self->{manager}->alert("dialog_dsserverid_inuse", $ans);
Index: DSMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSMigration.pm.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DSMigration.pm.in 4 Jul 2007 01:28:17 -0000 1.2
+++ DSMigration.pm.in 12 Jul 2007 13:52:42 -0000 1.3
@@ -53,6 +53,7 @@
# tempfiles
use File::Temp qw(tempfile tempdir);
+use File::Basename qw(basename);
# load perldap
use Mozilla::LDAP::Conn;
@@ -88,6 +89,8 @@
'nsslapd-lockdir' => 'nsslapd-lockdir',
'nsslapd-tmpdir' => 'nsslapd-tmpdir',
'nsslapd-certdir' => 'nsslapd-certdir',
+ 'nsslapd-ldifdir' => 'nsslapd-ldifdir',
+ 'nsslapd-bakdir' => 'nsslapd-bakdir',
'nsslapd-ldapifilepath' => 'nsslapd-ldapifilepath',
'nsslapd-ldapilisten' => 'nsslapd-ldapilisten',
'nsslapd-ldapiautobind' => 'nsslapd-ldapiautobind',
@@ -106,34 +109,55 @@
'aci' => 'aci'
);
-my $pkgname; # global used in several different places - set in migrateDS
-my $oldsroot; # global used in several different places - set in migrateDS
-
sub getNewDbDir {
- my ($ent, $attr, $inst) = @_;
+ my ($ent, $attr, $mig, $inst) = @_;
my %objclasses = map { lc($_) => $_ } $ent->getValues('objectclass');
my $cn = $ent->getValues('cn');
+ my $oldval = $ent->getValues($attr);
my $newval;
+ # there is one case where we want to just use the existing db directory
+ # that's the case where the user has moved the indexes and/or the
+ # transaction logs to different partitions for performance
+ # in that case, the old directory will not be the same as the default,
+ # and the directory will exist
+ my $olddefault = "$mig->{actualsroot}/$inst";
+ if (-d $oldval and ($oldval !~ /^$olddefault/)) {
+ debug(2, "Keeping old value [$oldval] for attr $attr in entry ", $ent->getDN(), "\n");
+ return $oldval;
+ }
+ # otherwise, just use the new default locations
if ($objclasses{nsbackendinstance}) {
- $newval = "@localstatedir@/lib/$pkgname/$inst/db/$cn";
+ $newval = "@localstatedir@/lib/$mig->{pkgname}/$inst/db/$cn";
} elsif (lc $cn eq 'config') {
- $newval = "@localstatedir@/lib/$pkgname/$inst/db";
+ $newval = "@localstatedir@/lib/$mig->{pkgname}/$inst/db";
} elsif (lc $cn eq 'changelog5') {
- $newval = "@localstatedir@/lib/$pkgname/$inst/cldb";
+ $newval = "@localstatedir@/lib/$mig->{pkgname}/$inst/changelogdb";
}
debug(2, "New value [$newval] for attr $attr in entry ", $ent->getDN(), "\n");
return $newval;
}
sub migrateCredentials {
- my ($ent, $attr, $inst) = @_;
+ my ($ent, $attr, $mig, $inst) = @_;
my $oldval = $ent->getValues($attr);
- debug(3, "Executing migratecred -o $oldsroot/$inst -n @instconfigdir@/$inst -c $oldval . . .\n");
- my $newval = `migratecred -o $oldsroot/$inst -n @instconfigdir@/$inst -c $oldval`;
+ debug(3, "Executing migratecred -o $mig->{actualsroot}/$inst -n @instconfigdir@/$inst -c $oldval . . .\n");
+ my $newval = `migratecred -o $mig->{actualsroot}/$inst -n @instconfigdir@/$inst -c $oldval`;
debug(3, "Converted old value [$oldval] to new value [$newval] for attr $attr in entry ", $ent->getDN(), "\n");
return $newval;
}
+sub removensState {
+ my ($ent, $attr, $mig, $inst) = @_;
+ my $newval;
+
+ # nsstate is binary and cannot be migrated cross platform
+ if (!$mig->{crossplatform}) {
+ $newval = $ent->getValues($attr);
+ }
+
+ return $newval;
+}
+
# these are attributes that we have to transform from
# the old value to the new value (e.g. a pathname)
# The key of this hash is the attribute name. The value
@@ -146,110 +170,170 @@
'nsslapd-db-logdirectory' => \&getNewDbDir,
'nsslapd-changelogdir' => \&getNewDbDir,
'nsds5replicacredentials' => \&migrateCredentials,
- 'nsmultiplexorcredentials' => \&migrateCredentials
+ 'nsmultiplexorcredentials' => \&migrateCredentials,
+ 'nsstate' => \&removensState
);
sub copyDatabaseDirs {
my $srcdir = shift;
my $destdir = shift;
- if (-d $srcdir && ! -d $destdir) {
+ my $filesonly = shift;
+ if (-d $srcdir && ! -d $destdir && !$filesonly) {
debug(1, "Copying database directory $srcdir to $destdir\n");
- system ("cp -p -r $srcdir $destdir") == 0 or
- die "Could not copy database directory $srcdir to $destdir: $?";
+ if (system ("cp -p -r $srcdir $destdir")) {
+ return ('error_copying_dbdir', $srcdir, $destdir, $?);
+ }
} elsif (! -d $srcdir) {
- die "Error: database directory $srcdir does not exist";
+ return ("error_dbsrcdir_not_exist", $srcdir);
} else {
debug(1, "The destination directory $destdir already exists, copying files/dirs individually\n");
foreach my $file (glob("$srcdir/*")) {
debug(3, "Copying $file to $destdir\n");
if (-f $file) {
- system ("cp -p $file $destdir") == 0 or
- die "Error: could not copy $file to $destdir: $!";
- } elsif (-d $file) {
- system ("cp -p -r $file $destdir") == 0 or
- die "Error: could not copy $file to $destdir: $!";
+ if (system ("cp -p $file $destdir")) {
+ return ('error_copying_dbfile', $file, $destdir, $?);
+ }
+ } elsif (-d $file && !$filesonly) {
+ if (system ("cp -p -r $file $destdir")) {
+ return ('error_copying_dbdir', $file, $destdir, $?);
+ }
}
}
}
}
-sub copyDatabases {
- my $oldroot = shift;
- my $inst = shift;
- my $newdbdir = shift;
-
- # global config and instance specific config are children of this entry
- my $basedbdn = normalizeDN("cn=ldbm database,cn=plugins,cn=config");
- # get the list of databases, their index and transaction log locations
- my $fname = "$oldroot/$inst/config/dse.ldif";
- open( DSELDIF, "$fname" ) || die "Can't open $fname: $!";
- my $in = new Mozilla::LDAP::LDIF(*DSELDIF);
- my $targetdn = normalizeDN("cn=config,cn=ldbm database,cn=plugins,cn=config");
- while (my $ent = readOneEntry $in) {
- next if (!$ent->getDN()); # just skip root dse
- # look for the one level children of $basedbdn
- my @rdns = ldap_explode_dn($ent->getDN(), 0);
- my $parentdn = normalizeDN(join(',', @rdns[1..$#rdns]));
- if ($parentdn eq $basedbdn) {
- my $cn = $ent->getValues('cn');
- my %objclasses = map { lc($_) => $_ } $ent->getValues('objectclass');
- if ($cn eq 'config') { # global config
- debug(1, "Found ldbm database plugin config entry ", $ent->getDN(), "\n");
- my $dir = $ent->getValues('nsslapd-directory');
- my $homedir = $ent->getValues('nsslapd-db-home-directory');
- my $logdir = $ent->getValues('nsslapd-db-logdirectory');
- debug(1, "old db dir = $dir homedir = $homedir logdir = $logdir\n");
- my $srcdir = $homedir || $dir || "$oldroot/$inst/db";
- copyDatabaseDirs($srcdir, $newdbdir);
- copyDatabaseDirs($logdir, $newdbdir) if ($logdir && $logdir ne $srcdir);
- } elsif ($objclasses{nsbackendinstance}) {
- debug(1, "Found ldbm database instance entry ", $ent->getDN(), "\n");
- my $dir = $ent->getValues('nsslapd-directory');
- # the default db instance directory is
- # $oldroot/$inst/$cn
- debug(1, "old instance $cn dbdir $dir\n");
- my $srcdir = $dir || "$oldroot/$inst/db/$cn";
- copyDatabaseDirs($srcdir, "$newdbdir/$cn");
- } # else just ignore for now
- }
- }
- close DSELDIF;
-}
-
-sub copyChangelogDB {
- my $oldroot = shift;
- my $inst = shift;
- my $newdbdir = shift;
+# migrate all of the databases in an instance
+sub migrateDatabases {
+ my $mig = shift; # the Migration object
+ my $inst = shift; # the instance name (e.g. slapd-instance)
+ my $src = shift; # a Conn to the source
+ my $dest = shift; # a Conn to the dest
+ my $olddefault = "$mig->{actualsroot}/$inst/db"; # old default db home directory
+ my @errs;
+
+ # first, look for an LDIF file in that directory with the same name as the
+ # database
+ my $foundldif;
+ for (glob("$mig->{oldsroot}/$inst/db/*.ldif")) {
+ my $dbname = basename($_, '.ldif');
+ my @cmd = ("@serverdir@/$inst/ldif2db", "-n", $dbname, "-i", $_);
+ debug(1, "migrateDatabases: executing command ", @cmd);
+ if (system(@cmd)) {
+ return ('error_importing_migrated_db', $_, $?);
+ }
+ $foundldif = 1;
+ }
+
+ if ($foundldif) {
+ return (); # done - can do nothing else for cross-platform
+ }
+
+ # if no LDIF files, just copy over the database directories
+ my $ent = $src->search("cn=ldbm database,cn=plugins,cn=config", "one",
+ "(objectclass=*)");
+ if (!$ent) {
+ return ("error_reading_olddbconfig", $src->getErrorString());
+ }
+ # there is one case where we want to just use the existing db directory
+ # that's the case where the user has moved the indexes and/or the
+ # transaction logs to different partitions for performance
+ # in that case, the old directory will not be the same as the default,
+ # and the directory will exist
+ my $olddefault = "$mig->{actualsroot}/$inst";
+ do {
+ my $cn = $ent->getValues('cn');
+ my %objclasses = map { lc($_) => $_ } $ent->getValues('objectclass');
+ if ($cn eq 'config') { # global config
+ my $newent = $dest->search($ent->getDN(), "base", "(objectclass=*)");
+ my $newdbdir = $newent->getValues('nsslapd-directory') ||
+ "@localstatedir@/lib/$mig->{pkgname}/$inst/db";
+ debug(1, "Found ldbm database plugin config entry ", $ent->getDN(), "\n");
+ my $dir = $ent->getValues('nsslapd-directory');
+ my $homedir = $ent->getValues('nsslapd-db-home-directory');
+ my $logdir = $ent->getValues('nsslapd-db-logdirectory');
+ debug(1, "old db dir = $dir homedir = $homedir logdir = $logdir\n");
+ my $srcdir = $homedir || $dir || "$olddefault/db";
+ if (-d $srcdir and ($srcdir !~ /^$olddefault/)) {
+ debug(2, "Not copying database files from [$srcdir]\n");
+ } else {
+ # replace the old sroot value with the actual physical location on the target/dest
+ $srcdir =~ s/^$mig->{actualsroot}/$mig->{oldsroot}/;
+ if (@errs = copyDatabaseDirs($srcdir, $newdbdir, 1)) {
+ return @errs;
+ }
+ }
+ if ($logdir && ($logdir ne $srcdir)) {
+ if (-d $logdir and ($logdir !~ /^$olddefault/)) {
+ debug(2, "Not copying transaction logs from [$logdir]\n");
+ } else {
+ # replace the old sroot value with the actual physical location on the target/dest
+ $newdbdir = $newent->getValues('nsslapd-db-logdirectory') ||
+ $newdbdir;
+ $logdir =~ s/^$mig->{actualsroot}/$mig->{oldsroot}/;
+ if (@errs = copyDatabaseDirs($logdir, $newdbdir, 1)) {
+ return @errs;
+ }
+ }
+ }
+ } elsif ($objclasses{nsbackendinstance}) {
+ debug(1, "Found ldbm database instance entry ", $ent->getDN(), "\n");
+ my $dir = $ent->getValues('nsslapd-directory');
+ # the default db instance directory is
+ # $oldroot/$inst/$cn
+ debug(1, "old instance $cn dbdir $dir\n");
+ my $srcdir = $dir || "$olddefault/db/$cn";
+ my $newent = $dest->search($ent->getDN(), "base", "(objectclass=*)");
+ my $newdbdir = $newent->getValues('nsslapd-directory') ||
+ "@localstatedir@/lib/$mig->{pkgname}/$inst/db";
+ if (-d $srcdir and ($srcdir !~ /^$olddefault/)) {
+ debug(2, "Not copying database indexes from [$srcdir]\n");
+ } else {
+ # replace the old sroot value with the actual physical location on the target/dest
+ $srcdir =~ s/^$mig->{actualsroot}/$mig->{oldsroot}/;
+ if (@errs = copyDatabaseDirs($srcdir, "$newdbdir/$cn")) {
+ return @errs;
+ }
+ }
+ }
+ } while ($ent = $src->nextEntry());
+
+ return ();
+}
+
+sub migrateChangelogs {
+ my $mig = shift; # the Migration object
+ my $inst = shift; # the instance name (e.g. slapd-instance)
+ my $src = shift; # a Conn to the source
+ my $dest = shift; # a Conn to the dest
+ my $olddefault = "$mig->{actualsroot}/$inst"; # old default db home directory
# changelog config entry
- my $cldn = normalizeDN("cn=changelog5, cn=config");
- my $fname = "$oldroot/$inst/config/dse.ldif";
- open( DSELDIF, "$fname" ) || die "Can't open $fname: $!";
- my $in = new Mozilla::LDAP::LDIF(*DSELDIF);
- while (my $ent = readOneEntry $in) {
- my $targetdn = normalizeDN($ent->getDN());
- if ($targetdn eq $cldn) {
- my $oldcldir = $ent->getValues('nsslapd-changelogdir');
- debug(1, "old cldb dir = $oldcldir\n");
- my $srcdir = $oldcldir || "$oldroot/$inst/cldb";
- copyDatabaseDirs($srcdir, $newdbdir);
- last;
+ my $oldent = $src->search("cn=changelog5, cn=config", "base", "(objectclass=*)");
+ my $newent = $dest->search("cn=changelog5, cn=config", "base", "(objectclass=*)");
+ if ($oldent and $newent) { # changelog configured
+ my $oldcldir = $oldent->getValues('nsslapd-changelogdir');
+ if (-d $oldcldir and ($oldcldir !~ /^$olddefault/)) {
+ debug(2, "Not copying changelogdb from [$oldcldir]\n");
+ } else {
+ # replace the old sroot value with the actual physical location on the target/dest
+ $oldcldir =~ s/^$mig->{actualsroot}/$mig->{oldsroot}/;
+ my $newcldir = $newent->getValues('nsslapd-changelogdir');
+ copyDatabaseDirs($oldcldir, $newcldir);
}
}
- close DSELDIF;
}
sub fixAttrsInEntry {
- my ($ent, $inst) = @_;
+ my ($ent, $mig, $inst) = @_;
for my $attr (keys %{$ent}) {
my $lcattr = lc $attr;
if ($transformAttr{$lcattr}) {
- $ent->setValues($attr, &{$transformAttr{$lcattr}}($ent, $attr, $inst));
+ $ent->setValues($attr, &{$transformAttr{$lcattr}}($ent, $attr, $mig, $inst));
}
}
}
sub mergeEntries {
- my ($old, $new, $inst) = @_;
+ my ($old, $new, $mig, $inst) = @_;
my %inoldonly; # attrs in old entry but not new one
my %innewonly; # attrs in new entry but not old one
my @attrs; # attrs common to old and new
@@ -280,7 +364,7 @@
} elsif ($transformAttr{$lcattr}) {
# only transform if the value is in the old entry
if (!$innewonly{$attr}) {
- $new->setValues($attr, &{$transformAttr{$lcattr}}($old, $attr, $inst));
+ $new->setValues($attr, &{$transformAttr{$lcattr}}($old, $attr, $mig, $inst));
}
} elsif ($cn eq "internationalization plugin" and $lcattr eq "nsslapd-pluginarg0") {
next; # use the new value of this path name
@@ -294,41 +378,72 @@
}
}
-sub mergeDseLdif {
- my $oldroot = shift;
- my $inst = shift;
- my $ent;
+
+my @allattrlist = ('*', 'aci', 'createTimestamp', 'creatorsName',
+ 'modifyTimestamp', 'modifiersName');
+
+sub getAllEntries {
+ my $conn = shift;
+ my $href = shift;
+ my $aref = shift;
+
+ # these are the special DSEs for which we only need ACIs
+ for my $dn ("", "cn=monitor", "cn=config") {
+ my $scope = $dn ? "sub" : "base";
+ my @attrlist;
+ if ($dn eq "cn=config") {
+ @attrlist = @allattrlist;
+ } else {
+ @attrlist = qw(aci);
+ }
+ my $ent = $conn->search($dn, $scope, "(objectclass=*)", 0, @attrlist);
+ next if (!$ent or ($conn->getErrorCode() eq 32));
+ if ($conn->getErrorCode()) {
+ return ('error_reading_entry', $dn, $conn->getErrorString());
+ }
+ do {
+ my $ndn = normalizeDN($ent->getDN());
+ $href->{$ndn} = $ent;
+ push @{$aref}, $ndn;
+ } while ($ent = $conn->nextEntry());
+ }
+
+ return ();
+}
+
+# these entries cannot be migrated if doing cross platform
+my %noCrossPlatformDN = (
+ 'cn=uniqueid generator,cn=config' => 'cn=uniqueid generator,cn=config'
+);
+
+sub mergeConfigEntries {
+ my $mig = shift; # the Migration object
+ my $inst = shift; # the instance name (e.g. slapd-instance)
+ my $src = shift; # a Conn to the source
+ my $dest = shift; # a Conn to the dest
# first, read in old file
my %olddse; # map of normalized DN to Entry
my @olddns; # the DNs in their original order
- my $fname = "$oldroot/$inst/config/dse.ldif";
- open( OLDDSELDIF, $fname ) || die "Can't open $fname: $!";
- my $in = new Mozilla::LDAP::LDIF(*OLDDSELDIF);
- while ($ent = readOneEntry $in) {
- my $dn = normalizeDN($ent->getDN());
- push @olddns, $dn;
- $olddse{$dn} = $ent;
+ my @errs;
+ if (@errs = getAllEntries($src, \%olddse, \@olddns)) {
+ return @errs;
}
- close OLDDSELDIF;
# next, read in new file
my %newdse; # map of normalized DN to Entry
+ my @allnewdns;
my @newdns; # the DNs in their original order that are not in olddns
- $fname = "@instconfigdir@/$inst/dse.ldif";
- open( NEWDSELDIF, $fname ) || die "Can't open $fname: $!";
- $in = new Mozilla::LDAP::LDIF(*NEWDSELDIF);
- while ($ent = readOneEntry $in) {
- my $dn = normalizeDN($ent->getDN());
- $newdse{$dn} = $ent;
- if (! exists $olddse{$dn}) {
- push @newdns, $dn;
+ if (@errs = getAllEntries($dest, \%newdse, \@allnewdns)) {
+ return @errs;
+ }
+
+ for my $ndn (@allnewdns) {
+ if (! exists $olddse{$ndn}) {
+ push @newdns, $ndn;
}
}
- close NEWDSELDIF;
- # temp file for new, merged dse.ldif
- my ($dsefh, $tmpdse) = tempfile(SUFFIX => '.ldif');
# now, compare entries
# if the entry exists in the old tree but not the new, add it
# if the entry exists in the new tree but not the old, delete it
@@ -339,58 +454,144 @@
for my $dn (@olddns, @newdns) {
my $oldent = $olddse{$dn};
my $newent = $newdse{$dn};
- my $outputent;
- if ($oldent && !$newent) {
+ my $op;
+ my $rc = 1;
+ if ($mig->{crossplatform} && $noCrossPlatformDN{$dn}) {
+ debug(1, "Cannot migrate the entry $dn - skipping\n");
+ next;
+ } elsif ($oldent && !$newent) {
# may have to fix up some values in the old entry
- fixAttrsInEntry($oldent, $inst);
- # output $oldent
- $outputent = $oldent;
+ fixAttrsInEntry($oldent, $mig, $inst);
+ $rc = $dest->add($oldent);
+ $op = "add";
} elsif (!$oldent && $newent) {
- next if ($dn =~ /o=deleteAfterMigration/i);
- # output $newent
- $outputent = $newent;
+ if ($dn =~ /o=deleteAfterMigration/i) {
+ $rc = $dest->delete($dn);
+ $op = "delete";
+ } else {
+ # do nothing - no change to entry
+ }
} else { #merge
# $newent will contain the merged entry
- mergeEntries($oldent, $newent, $inst);
- $outputent = $newent;
+ mergeEntries($oldent, $newent, $mig, $inst);
+ $rc = $dest->update($newent);
+ $op = "update";
}
- # special fix for rootDSE - perldap doesn't like "" for a dn
- if (! $outputent->getDN()) {
- my $ary = $outputent->getLDIFrecords();
- shift @$ary; # remove "dn"
- shift @$ary; # remove the empty dn value
- print $dsefh "dn:\n";
- print $dsefh (Mozilla::LDAP::LDIF::pack_LDIF (78, $ary), "\n");
- } else {
- Mozilla::LDAP::LDIF::put_LDIF($dsefh, 78, $outputent);
+
+ if (!$rc) {
+ return ('error_updating_merge_entry', $op, $dn, $dest->getErrorString());
+ }
+ }
+
+ return ();
+}
+
+my %deletedschema = (
+ '50ns-calendar' => '50ns-calendar.ldif',
+ '50ns-compass' => '50ns-compass.ldif',
+ '50ns-delegated-admin' => '50ns-delegated-admin.ldif',
+ '50ns-legacy' => '50ns-legacy.ldif',
+ '50ns-mail' => '50ns-mail.ldif',
+ '50ns-mcd-browser' => '50ns-mcd-browser.ldif',
+ '50ns-mcd-config' => '50ns-mcd-config.ldif',
+ '50ns-mcd-li' => '50ns-mcd-li.ldif',
+ '50ns-mcd-mail' => '50ns-mcd-mail.ldif',
+ '50ns-media' => '50ns-media.ldif',
+ '50ns-mlm' => '50ns-mlm.ldif',
+ '50ns-msg' => '50ns-msg.ldif',
+ '50ns-netshare' => '50ns-netshare.ldif',
+ '50ns-news' => '50ns-news.ldif',
+ '50ns-proxy' => '50ns-proxy.ldif',
+ '50ns-wcal' => '50ns-wcal.ldif',
+ '51ns-calendar' => '51ns-calendar.ldif'
+);
+
+sub migrateSchema {
+ my $mig = shift; # the Migration object
+ my $inst = shift; # the instance name (e.g. slapd-instance)
+ my $src = shift; # a Conn to the source
+ my $dest = shift; # a Conn to the dest
+
+ my $cfgent = $dest->search("cn=config", "base", "(objectclass=*)");
+ my $newschemadir = $cfgent->getValues('nsslapd-schemadir') ||
+ "$mig->{configdir}/$inst/schema";
+ my %newschema = map {basename($_, '.ldif') => $_} glob("$newschemadir/*.ldif");
+ delete $newschema{"99user"}; # always copy this one
+ for (glob("$mig->{oldsroot}/$inst/config/schema/*.ldif")) {
+ my $fname = basename($_, '.ldif');
+ next if ($deletedschema{$fname}); # don't copy deleted schema
+ next if ($newschema{$fname}); # use new version
+ if (system("cp -p $_ $newschemadir")) {
+ return ("error_migrating_schema", $_, $!);
+ }
+ }
+
+ return ();
+}
+
+sub migrateDSInstance {
+ my $mig = shift; # the Migration object
+ my $inst = shift; # the instance name (e.g. slapd-instance)
+ my $src = shift; # a Conn to the source
+ my $dest = shift; # a Conn to the dest
+
+ my @errs;
+ # first, merge dse ldif
+ if (@errs = mergeConfigEntries($mig, $inst, $src, $dest)) {
+ return @errs;
+ }
+
+ # next, grab the old schema
+ if (@errs = migrateSchema($mig, $inst, $src, $dest)) {
+ return @errs;
+ }
+
+ # next, the databases
+ if (@errs = migrateDatabases($mig, $inst, $src, $dest)) {
+ return @errs;
+ }
+
+ # next, the changelogs
+ if (!$mig->{crossplatform}) {
+ if (@errs = migrateChangelogs($mig, $inst, $src, $dest)) {
+ return @errs;
}
}
- close $dsefh;
- return $tmpdse;
+ # next, the security files
+ my $cfgent = $dest->search("cn=config", "base", "(objectclass=*)");
+ my $newcertdir = $cfgent->getValues("nsslapd-certdir") ||
+ "@instconfigdir@/$inst";
+ $mig->migrateSecurityFiles($inst, $newcertdir);
+
+ return @errs;
}
sub migrateDS {
my $mig = shift;
- $pkgname = $mig->{pkgname}; # set globals
- $oldsroot = $mig->{oldsroot}; # set globals
my @errs;
# for each instance
foreach my $inst (@{$mig->{instances}}) {
- if (-f "@instconfigdir@/$inst/dse.ldif") {
- $mig->msg($WARN, 'instance_already_exists', "@instconfigdir@/$inst/dse.ldif");
+ if (-f "$mig->{configdir}/$inst/dse.ldif") {
+ $mig->msg($WARN, 'instance_already_exists', "$mig->{configdir}/$inst/dse.ldif");
next;
}
- # set instance specific defaults
- my $newdbdir = "@localstatedir@/lib/$pkgname/$inst/db";
- my $newcertdir = "@instconfigdir@/$inst";
- my $newcldbdir = "@localstatedir@/lib/$pkgname/$inst/cldb";
+
+ # you could theoretically make this work with either a remote source or
+ # remote dest
+ # $mig->{inf} would contain an entry for each instance e.g.
+ # $mig->{inf}->{$inst}
+ # each instance specific entry would contain a {General} and a {slapd}
+ # all the information necessary to open an LDAP::Conn to the server
+ # if the source, you could also change createInfFromConfig to read
+ # the info from the Conn (or FileConn) that's needed to create the
+ # instance on the dest
# extract the information needed for ds_newinst.pl
- my $configdir = "$oldsroot/$inst/config";
- my $inf = createInfFromConfig($configdir, $inst, \@errs);
- debug(2, "Using inffile $inf->{filename} created from $configdir\n");
+ my $oldconfigdir = "$mig->{oldsroot}/$inst/config";
+ my $inf = createInfFromConfig($oldconfigdir, $inst, \@errs);
+ debug(2, "Using inffile $inf->{filename} created from $oldconfigdir\n");
if (@errs) {
$mig->msg(@errs);
return 0;
@@ -407,31 +608,16 @@
$mig->msg('created_dsinstance', $output);
}
- # copy over the files/directories
- # copy the databases
- copyDatabases($oldsroot, $inst, $newdbdir);
-
- # copy the security related files
- $mig->migrateSecurityFiles($inst, $newcertdir);
-
- # copy the repl changelog database
- copyChangelogDB($oldsroot, $inst, $newcldbdir);
-
- # merge the old info into the new dse.ldif
- my $tmpdse = mergeDseLdif($oldsroot, $inst);
-
- # get user/group of new dse
- my ($dev, $ino, $mode, $uid, $gid, @rest) = stat "@instconfigdir@/$inst/dse.ldif";
- # save the original new dse.ldif
- system("cp -p @instconfigdir@/$inst/dse.ldif @instconfigdir@/$inst/dse.ldif.premigrate");
- # copy the new one
- system("cp $tmpdse @instconfigdir@/$inst/dse.ldif");
- # change owner/group
- chmod $mode, "@instconfigdir@/$inst/dse.ldif";
- chown $uid, $gid, "@instconfigdir@/$inst/dse.ldif";
+ my $src = new FileConn("$oldconfigdir/dse.ldif", 1); # read-only
+ my $dest = new FileConn("$mig->{configdir}/$inst/dse.ldif");
- # remove the temp one
- unlink($tmpdse);
+ @errs = migrateDSInstance($mig, $inst, $src, $dest);
+ $src->close();
+ $dest->close();
+ if (@errs) {
+ $mig->msg(@errs);
+ return 0;
+ }
}
return 1;
Index: FileConn.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/FileConn.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileConn.pm 4 Jul 2007 01:28:17 -0000 1.1
+++ FileConn.pm 12 Jul 2007 13:52:42 -0000 1.2
@@ -54,10 +54,12 @@
sub new {
my $class = shift;
my $filename = shift;
+ my $readonly = shift;
my $self = {};
$self = bless $self, $class;
+ $self->{readonly} = $readonly;
$self->read($filename);
return $self;
@@ -103,8 +105,12 @@
my $context = shift;
my $suppress = shift;
my $ndn = normalizeDN($dn);
- my $children = $self->{$ndn}->{children};
- if (($scope != LDAP_SCOPE_ONELEVEL) && $self->{$ndn}->{data} && !$suppress) {
+ my $children;
+ if (exists($self->{$ndn}) and exists($self->{$ndn}->{children})) {
+ $children = $self->{$ndn}->{children};
+ }
+ if (($scope != LDAP_SCOPE_ONELEVEL) && exists($self->{$ndn}) &&
+ exists($self->{$ndn}->{data}) && $self->{$ndn}->{data} && !$suppress) {
&{$callback}($self->{$ndn}->{data}, $context);
}
@@ -146,7 +152,7 @@
$filename = $self->{filename};
}
- if (!$self->{filename}) {
+ if (!$self->{filename} or $self->{readonly}) {
return;
}
@@ -181,8 +187,14 @@
print "$str ", $self->getErrorString(), "\n";
}
+sub DESTROY {
+ my $self = shift;
+ $self->close();
+}
+
sub close {
my $self = shift;
+ return if ($self->{readonly});
$self->write();
}
@@ -280,7 +292,7 @@
$self->{entries} = [];
my $ndn = normalizeDN($basedn);
- if (!exists($self->{$ndn})) {
+ if (!exists($self->{$ndn}) or !exists($self->{$ndn}->{data})) {
$self->setErrorCode(LDAP_NO_SUCH_OBJECT);
return undef;
}
@@ -308,12 +320,22 @@
my $parentdn = getParentDN($dn);
my $nparentdn = normalizeDN($parentdn);
+
$self->setErrorCode(0);
+ # special case of root DSE
+ if (!$ndn and exists($self->{$ndn}) and
+ !exists($self->{$ndn}->{data})) {
+ $self->{$ndn}->{data} = $entry;
+ $self->write();
+ return 1;
+ }
+
if (exists($self->{$ndn})) {
$self->setErrorCode(LDAP_ALREADY_EXISTS);
return 0;
}
- if ($nparentdn && !exists($self->{$nparentdn})) {
+
+ if ($ndn && $nparentdn && !exists($self->{$nparentdn})) {
$self->setErrorCode(LDAP_NO_SUCH_OBJECT);
return 0;
}
@@ -321,7 +343,10 @@
# data is the actual Entry
# children is the array ref of the one level children of this dn
$self->{$ndn}->{data} = $entry;
- push @{$self->{$nparentdn}->{children}}, $self->{$ndn};
+ # don't add parent to list of children
+ if ($nparentdn ne $ndn) {
+ push @{$self->{$nparentdn}->{children}}, $self->{$ndn};
+ }
return 1;
}
@@ -339,6 +364,7 @@
}
$self->{$ndn}->{data} = $entry;
+ $self->write();
return 1;
}
@@ -370,20 +396,23 @@
my $parentdn = getParentDN($dn);
my $nparentdn = normalizeDN($parentdn);
# delete this node from its parent
- for (my $ii = 0; $ii < @{$self->{$nparentdn}->{children}}; ++$ii) {
- # find matching hash ref in parent's child list
- if ($self->{$nparentdn}->{children}->[$ii] eq $self->{$ndn}) {
- # remove that element from the array
- splice @{$self->{$nparentdn}->{children}}, $ii, 1;
- # done - should only ever be one matching child
- last;
+ if ($ndn ne $nparentdn) {
+ for (my $ii = 0; $ii < @{$self->{$nparentdn}->{children}}; ++$ii) {
+ # find matching hash ref in parent's child list
+ if ($self->{$nparentdn}->{children}->[$ii] eq $self->{$ndn}) {
+ # remove that element from the array
+ splice @{$self->{$nparentdn}->{children}}, $ii, 1;
+ # done - should only ever be one matching child
+ last;
+ }
}
}
# delete this node
delete $self->{$ndn};
- return 0;
+ $self->write();
+ return 1;
}
1;
Index: Migration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Migration.pm.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Migration.pm.in 29 Jun 2007 21:12:21 -0000 1.1
+++ Migration.pm.in 12 Jul 2007 13:52:42 -0000 1.2
@@ -101,16 +101,24 @@
--version Print the version and exit
--debug Turn on debugging
--oldsroot The old server root directory to migrate from
- --actualsroot This is the old location of the old server root. See below.
+ --actualsroot This is the old location of the old server root.
+ See below.
--silent Use silent setup - no user input
- --file=name Use the file 'name' in .inf format to supply the default answers
- --keepcache Do not delete the temporary .inf file generated by this program
- --logfile Log migration messages to this file - otherwise, a temp file will be used
- --instance By default, all directory server instances will be migrated. You can use
- this argument to specify one or more (e.g. -i slapd-foo -i slapd-bar) if
- you do not want to migrate all of them.
-For all options, you can also use the short name e.g. -h, -d, etc. For the -d argument,
-specifying it more than once will increase the debug level e.g. -ddddd
+ --file=name Use the file 'name' in .inf format to supply the
+ default answers
+ --keepcache Do not delete the temporary .inf file generated by
+ this program
+ --logfile Log migration messages to this file - otherwise, a temp
+ file will be used
+ --instance By default, all directory server instances will be
+ migrated. You can use this argument to specify one
+ or more (e.g. -i slapd-foo -i slapd-bar) if you do
+ not want to migrate all of them.
+ --cross See below.
+
+For all options, you can also use the short name e.g. -h, -d, etc.
+For the -d argument, specifying it more than once will increase the
+debug level e.g. -ddddd
args:
You can supply default .inf data in this format:
@@ -119,7 +127,18 @@
General.FullMachineName=foo.example.com
or
"slapd.Suffix=dc=example, dc=com"
-Values passed in this manner will override values in an .inf file given with the -f argument.
+Values passed in this manner will override values in an .inf file
+given with the -f argument. If you need to specify the cleartext
+directory manager password (e.g. in order to do remote migration),
+you must specify the password for each instance in a section whose
+name is the instance name e.g.
+ [slapd-ldap1]
+ RootDNPwd=ldap1password
+ [slapd-ldap2]
+ RootDNPwd=ldap2password
+or on the command line like this:
+ command ... slapd-ldap1.RootDNPwd=ldap1password \
+ slapd-ldap2.RootDNPwd=ldap2password ...
actualsroot:
This is used when you must migrate from one machine to another. The
@@ -142,13 +161,36 @@
--oldsroot argument. That is, the oldsroot is the physical location of
the files on disk. The actualsroot is the old value of the server root
on the source machine.
+
+cross:
+Also known as crossplatform, or 'c', or 'x'.
+This is when the source machine is a different architecture than the
+destination machine. In this case, only certain data will be available
+for migration. Changelog information will not be migrated, and replicas
+will need to be reinitialized (if migrating masters or hubs). This type
+of migration requires that all of your old databases have been dumped
+to LDIF format, and the LDIF file must be in the default database directory
+(usually /opt/@brand at -ds/slapd-instance/db), and the LDIF file must have
+the same name as the database instance directory, with a ".ldif". For
+example, if you have
+ /opt/@brand at -ds/slapd-instance/db/userRoot/ and
+ /opt/@brand at -ds/slapd-instance/db/NetscapeRoot/
+you must first use db2ldif to export these databases to LDIF e.g.
+ cd /opt/@brand at -ds/slapd-instance
+ ./db2ldif -n userRoot -a /opt/@brand at -ds/slapd-instance/db/userRoot.ldif and
+ ./db2ldif -n NetscapeRoot -a /opt/@brand at -ds/slapd-instance/db/NetscapeRoot.ldif
+
+Then you must somehow make your old server root directory available on
+the destination machine, either by creating a tar archive on the source
+and copying it to the destination, or by network mounting the source
+directory on the destination machine.
EOF
}
sub init {
my $self = shift;
$self->{res} = shift;
- my ($silent, $inffile, $keep, $preonly, $logfile, $oldsroot, $actualsroot);
+ my ($silent, $inffile, $keep, $preonly, $logfile, $oldsroot, $actualsroot, $crossplatform);
my @instances;
GetOptions('help|h|?' => sub { VersionMessage(); HelpMessage(); exit 0 },
@@ -161,6 +203,7 @@
'logfile|l=s' => \$logfile,
'oldsroot|o=s' => \$oldsroot,
'actualsroot|a=s' => \$actualsroot,
+ 'crossplatform|cross|c|x' => \$crossplatform,
'instance|i=s' => \@instances
);
@@ -180,6 +223,7 @@
$self->{keep} = $keep;
$self->{preonly} = $preonly;
$self->{logfile} = $logfile;
+ $self->{crossplatform} = $crossplatform;
$self->{log} = new SetupLog($self->{logfile}, "migrate");
# if user supplied inf file, use that to initialize
if (defined($self->{inffile})) {
@@ -220,7 +264,12 @@
glob("$self->{oldsroot}/slapd-*");
}
- die "No instances found to migrate" unless (@instances);
+ if (!@instances) {
+ $self->msg($FATAL, "error_no_instances", $self->{oldsroot});
+ VersionMessage();
+ HelpMessage();
+ exit 1;
+ }
$self->{instances} = \@instances;
}
Index: Util.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Util.pm.in 6 Jul 2007 17:39:36 -0000 1.6
+++ Util.pm.in 12 Jul 2007 13:52:42 -0000 1.7
@@ -47,10 +47,12 @@
@ISA = qw(Exporter);
@EXPORT = qw(portAvailable getAvailablePort isValidDN addSuffix getMappedEntries
process_maptbl check_and_add_entry getMappedEntries
- getHashedPassword debug createDSInstance createInfFromConfig);
+ getHashedPassword debug createDSInstance createInfFromConfig
+ isValidServerID);
@EXPORT_OK = qw(portAvailable getAvailablePort isValidDN addSuffix getMappedEntries
process_maptbl check_and_add_entry getMappedEntries
- getHashedPassword debug createDSInstance createInfFromConfig);
+ getHashedPassword debug createDSInstance createInfFromConfig
+ isValidServerID);
use strict;
@@ -102,6 +104,40 @@
return ($dn =~ /^[0-9a-zA-Z_-]+=.*$/);
}
+sub isValidServerID {
+ my $servid = shift;
+ my $validchars = '#%,.:\w at _-';
+ return $servid =~ /^[$validchars]+$/o;
+}
+
+sub isValidUser {
+ my $user = shift;
+ # convert numeric uid to string
+ my $strans = $user;
+ if ($user =~ /^\d+$/) { # numeric - convert to string
+ $strans = getpwuid $user;
+ if (!$strans) {
+ return ("dialog_ssuser_error", $user);
+ }
+ }
+ if ($> != 0) { # if not root, the user must be our uid
+ my $username = getlogin;
+ if ($strans ne $username) {
+ return ("dialog_ssuser_must_be_same", $username);
+ }
+ } else { # user is root - verify id
+ my $nuid = getpwnam $strans;
+ if (!defined($nuid)) {
+ return ("dialog_ssuser_error", $user);
+ }
+ if (!$nuid) {
+ return ("dialog_ssuser_root_warning");
+ }
+ }
+
+ return ();
+}
+
# delete the subtree starting from the passed entry
sub delete_all
{
Index: migrate-ds.res
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/migrate-ds.res,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- migrate-ds.res 29 Jun 2007 21:12:21 -0000 1.1
+++ migrate-ds.res 12 Jul 2007 13:52:42 -0000 1.2
@@ -1,4 +1,13 @@
begin_ds_migration = Beginning migration of directory server instances in %s . . .\n
end_ds_migration = Directory server migration is complete. Please check output and log files for details.\n
migration_exiting = Exiting . . .\nLog file is '%s'\n\n
-instance_already_exists = The target directory server instance already exists at %s. Skipping migration.\n\
+instance_already_exists = The target directory server instance already exists at %s. Skipping migration. Note that if you want to migrate the old instance you will have to first remove the new one of the same name.\n\n
+error_reading_entry = Could not read the entry '%s'. Error: %s\n
+error_updating_merge_entry = Could not %s the migrated entry '%s' in the target directory server. Error: %s\n
+error_importing_migrated_db = Could not import the LDIF file '%s' for the migrated database. Error: %s. Please check the directory server error log for more details.\n
+error_reading_olddbconfig = Could not read the old database configuration information. Error: %s\n
+error_migrating_schema = Could not copy old schema file '%s'. Error: %s\n
+error_copying_dbdir = Could not copy database directory '%s' to '%s'. Error: %s\n
+error_copying_dbfile = Could not copy database file '%s' to '%s'. Error: %s\n
+error_dbsrcdir_not_exist = Could not copy from the database source directory '%s' because it does not exist. Please check your configuration.\n
+error_no_instances = Could not find any instances in the old directory '%s' to migrate.\n
Index: setup-ds.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.pl.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- setup-ds.pl.in 4 Jul 2007 01:28:17 -0000 1.4
+++ setup-ds.pl.in 12 Jul 2007 13:52:42 -0000 1.5
@@ -42,6 +42,7 @@
use strict;
use Setup;
+use SetupLog;
use Inf;
use Resource;
use DialogManager;
@@ -78,4 +79,12 @@
$setup->msg('created_dsinstance', $output);
}
-$setup->doExit();
+END {
+ if ($setup) {
+ if (!$setup->{keep}) {
+ unlink $setup->{inffile};
+ }
+
+ $setup->doExit();
+ }
+}
Index: setup-ds.res.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.res.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- setup-ds.res.in 4 Jul 2007 01:28:17 -0000 1.6
+++ setup-ds.res.in 12 Jul 2007 13:52:42 -0000 1.7
@@ -95,3 +95,12 @@
error_deleteall_entries = Error deleting entry '%s' and all children. Error: %s\n
error_adding_entry = Error adding entry '%s'. Error: %s\n
error_updating_entry = Error updating entry '%s'. Error: %s\n
+
+
+error_invalid_param = The parameter '%s' has an invalid value '%s'.\n
+error_port_available = The port number '%s' is not available for use. This may be due to an\
+invalid port number, or the port already being in use by another\
+program, or low port restriction. Please choose another value for\
+ServerPort. Error: $!\n
+error_invalid_serverid = The ServerIdentifier '%s' contains invalid characters. It must\
+contain only alphanumeric characters and the following: #%,.:@_-\n
From fedora-directory-commits at redhat.com Thu Jul 12 14:00:12 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 12 Jul 2007 10:00:12 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
migrate-ds-admin.pl.in, 1.2, 1.3
Message-ID: <200707121400.l6CE0Ct0011414@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11394/adminserver/admserv/newinst/src
Modified Files:
migrate-ds-admin.pl.in
Log Message:
Resolves: bug 245815
Bug Description: DS Admin Migration framework - cross platform support
Reviewed by: nhosoi (Thanks!)
Fix Description: There are basically three parts to cross platform support
1) Allow a different physical server root than the logical server root. This allows you to copy the old server root directory to the target machine, either by making a tarball or by a network mount. Then you can migrate from e.g. /mnt/opt/fedora-ds, and specify that the real old server root was /opt/fedora-ds. This is the distinction between the --oldsroot and --actualsroot parameters.
2) Cross platform database migration requires the old data is converted to LDIF first. Migration makes the simplifying assumption that the database LDIF file is in the old db directory and has the name of .ldif e.g. userRoot.ldif
3) Cross platform replication migration doesn't preserve the state, so the changelog nor other associated state information can be migrated.
I rewrote the old migration script to use the FileConn - this theoretically will allow us to support migration using an LDAP::Conn as well.
I had to make some fixes to FileConn, primarily to support the root DSE.
Platforms tested: RHEL4
Flag Day: no
Doc impact: Yes, along with the rest of the new migration framework.
Index: migrate-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/migrate-ds-admin.pl.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- migrate-ds-admin.pl.in 4 Jul 2007 01:31:33 -0000 1.2
+++ migrate-ds-admin.pl.in 12 Jul 2007 14:00:10 -0000 1.3
@@ -67,7 +67,9 @@
# either the config ds will be one of them, or we
# should have already migrated the config DS
$mig->msg('begin_ds_migration', $mig->{oldsroot});
-migrateDS($mig);
+if (!migrateDS($mig)) {
+ exit 1;
+}
# if the config ds is on the local machine, shut down the old one
# and bring up the new one - the rest of migration needs to update it
From fedora-directory-commits at redhat.com Thu Jul 12 18:11:31 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Thu, 12 Jul 2007 14:11:31 -0400
Subject: [Fedora-directory-commits]
esc/src/app/xul/esc/chrome/icons/default esc-window.ico, NONE,
1.1 settings-window.ico, NONE, 1.1
Message-ID: <200707121811.l6CIBV9K015424@cvs-int.fedora.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/icons/default
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15407
Added Files:
esc-window.ico settings-window.ico
Log Message:
Initial revision. r. mharmsen
--- NEW FILE esc-window.ico ---
/@
p?
8Y
p?
6W
?f}??<
??O?
G
S??nnnQ ?w??.jg++?j?6O(?fZ?????"StP&???u?}?;?
;6O(?T???????DS?S?????
Author: nhosoi
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29649/com/netscape/admin/dirserv
Modified Files:
DSContentPage.java
Log Message:
Resolves: #248073
Summary: Directory Browser shows nothing if the suffix is empty
Description: always displays the system entries (cn=config, cn=monitor, and
cn=schema) regardless of the suffix's existence.
Index: DSContentPage.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSContentPage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DSContentPage.java 9 Sep 2005 18:23:11 -0000 1.2
+++ DSContentPage.java 13 Jul 2007 16:34:39 -0000 1.3
@@ -247,21 +247,22 @@
return null;
}
- public void finished() {
+ public void finished() {
_framework.setBusyCursor(false);
if (_suffixes != null) {
- // We populate the browser controller
- for (int i = 0; i < _suffixes.length; i++) {
+ // We populate the browser controller
+ for (int i = 0; i < _suffixes.length; i++) {
_controller.addSuffix(_suffixes[i], null);
}
- _controller.addSuffix("cn=schema", null);
- _controller.addSuffix("cn=monitor", null);
- _controller.addSuffix("cn=config", null);
}
else {
- // Probably an error
+ // Suffix has no entry
Debug.println(0, "DSContentPage.initialize: no suffix found");
- }
+ }
+ // Even if suffix has no entry, we should show system entries
+ _controller.addSuffix("cn=schema", null);
+ _controller.addSuffix("cn=monitor", null);
+ _controller.addSuffix("cn=config", null);
_childrenController.setSorted(isSorted);
_controller.setShowContainerOnly(_layout.equals(ContentMenuController.NODE_LEAF_LAYOUT));
From fedora-directory-commits at redhat.com Fri Jul 13 18:35:34 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 13 Jul 2007 14:35:34 -0400
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.48,
1.49 configure.ac, 1.33, 1.34 aclocal.m4, 1.40, 1.41 configure,
1.51, 1.52 missing, 1.30, 1.31 install-sh, 1.30, 1.31 depcomp,
1.30, 1.31 compile, 1.30, 1.31 config.sub, 1.29,
1.30 config.guess, 1.29, 1.30 Makefile.in, 1.57, 1.58
Message-ID: <200707131835.l6DIZYRj031217@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31095/ldapserver
Modified Files:
Makefile.am configure.ac aclocal.m4 configure missing
install-sh depcomp compile config.sub config.guess Makefile.in
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script
Reviewed by: nhosoi (Thanks!)
Fix Description: The time has come. We can finally get rid of the instance creation C code
once and for all. I've created a DSCreate module that has all of the functionality of the old
create_instance.c code, along with a few items from ldap/admin/lib. The way it works is
this: it first creates the dse.ldif file using template-dse.ldif and the suffix-db template to
create the initial db and suffix. It then adds additional optional configuration depending
on what optional features have been enabled. It creates other config files and copies in
the schema. It then initializes the database. It uses a template file based on the type of
entry implied by the suffix, then adds the default ACIs. If the user chose to do so, it
will also create the ou=people, ou=groups, etc. entries. The user can also supply an LDIF
file which will be used to populate the initial database, in which case none of the default
entries or ACIs will be used. It then starts the server (if desired).
I had to create a function makePaths that works like mkdir -p except that it will chown,
chgrp, and chmod all paths created.
I had to change the other places where instance creation was called to use the new
calling semantics. ds_create changed quite a bit, since it can just use an Inf to pass in the
information instead of calling ds_newinst as a CGI program.
I had to change FileConn to add support for namingContexts (i.e. entries with no parent),
and to have it write each change each time, and to return copies of entries when searching,
to avoid modifying the tree in place. This makes it act much more like LDAP.
I found and fixed a few bugs in Migration along the way that were revealed while integrating
the new DSCreate code.
Platforms tested: RHEL4, FC6
Flag Day: Yes. New instance creation code and autotool changes.
Doc impact: no
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Makefile.am 4 Jul 2007 01:28:17 -0000 1.48
+++ Makefile.am 13 Jul 2007 18:35:32 -0000 1.49
@@ -98,13 +98,16 @@
# this is how to add optional plugins
if enable_pam_passthru
LIBPAM_PASSTHRU_PLUGIN = libpam-passthru-plugin.la
+enable_pam_passthru = 1
endif
if enable_dna
LIBDNA_PLUGIN = libdna-plugin.la
+enable_dna = 1
endif
if enable_bitwise
LIBBITWISE_PLUGIN = libbitwise-plugin.la
+enable_bitwise = 1
endif
serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la \
@@ -145,6 +148,14 @@
ldap/ldif/template-pampta.ldif \
ldap/ldif/template-dnaplugin.ldif \
ldap/ldif/template-bitwise.ldif \
+ ldap/ldif/template-dse.ldif \
+ ldap/ldif/template-org.ldif \
+ ldap/ldif/template-domain.ldif \
+ ldap/ldif/template-state.ldif \
+ ldap/ldif/template-locality.ldif \
+ ldap/ldif/template-country.ldif \
+ ldap/ldif/template-orgunit.ldif \
+ ldap/ldif/template-baseacis.ldif \
$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-FamilyNames \
$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-GivenNames \
$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-OrgUnits
@@ -201,7 +212,8 @@
ldap/admin/src/scripts/Setup.pm \
ldap/admin/src/scripts/Migration.pm \
ldap/admin/src/scripts/DSMigration.pm \
- ldap/admin/src/scripts/FileConn.pm
+ ldap/admin/src/scripts/FileConn.pm \
+ ldap/admin/src/scripts/DSCreate.pm
property_DATA = ldap/admin/src/scripts/setup-ds.res \
ldap/admin/src/scripts/migrate-ds.res
@@ -217,6 +229,7 @@
ldap/admin/src/scripts/template-saveconfig \
ldap/admin/src/scripts/template-start-slapd \
ldap/admin/src/scripts/template-stop-slapd \
+ ldap/admin/src/scripts/template-restart-slapd \
ldap/admin/src/scripts/template-suffix2instance \
ldap/admin/src/scripts/template-vlvindex \
ldap/admin/src/scripts/template-bak2db.pl \
@@ -236,7 +249,9 @@
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
-inf_DATA = ldap/admin/src/slapd.inf
+inf_DATA = ldap/admin/src/slapd.inf \
+ ldap/admin/src/scripts/dscreate.map \
+ ldap/admin/src/scripts/dsorgentries.map
#////////////////////////////////////////////////////////////////
#
@@ -938,6 +953,7 @@
#------------------------
if enable_ldapi
GETSOCKETPEER=ldap/servers/slapd/getsocketpeer.c
+ enable_ldapi = 1
endif
ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \
@@ -1034,20 +1050,29 @@
-e 's, at configdir\@,$(configdir),g' \
-e 's, at sysconfdir\@,$(sysconfdir),g' \
-e 's, at localstatedir\@,$(localstatedir),g' \
+ -e 's, at infdir\@,$(infdir),g' \
+ -e 's, at templatedir\@,$(sampledatadir),g' \
-e 's, at package_name\@,$(PACKAGE_NAME),g' \
-e 's, at instconfigdir\@,$(instconfigdir),g' \
+ -e 's, at enable_ldapi\@,$(enable_ldapi),g' \
+ -e 's, at enable_pam_passthru\@,$(enable_pam_passthru),g' \
+ -e 's, at enable_bitwise\@,$(enable_bitwise),g' \
+ -e 's, at enable_dna\@,$(enable_dna),g' \
+ -e 's, at enable_autobind\@,$(enable_autobind),g' \
-e 's, at ECHO_N\@,$(ECHO_N),g' \
-e 's, at ECHO_C\@,$(ECHO_C),g' \
-e 's, at brand\@,$(brand),g' \
-e 's, at capbrand\@,$(capbrand),g' \
-e 's, at vendor\@,$(vendor),g' \
+ -e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
-e 's, at BUILDNUM\@,$(BUILDNUM),g' \
-e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
-e 's, at perldir\@,$(perldir),g' \
-e 's, at defaultuser\@,$(defaultuser),g' \
- -e 's, at defaultgroup\@,$(defaultgroup),g'
+ -e 's, at defaultgroup\@,$(defaultgroup),g' \
+ -e 's, at with_fhs_opt\@, at with_fhs_opt@,g'
else
fixupcmd = sed \
-e 's, at bindir\@,$(bindir),g' \
@@ -1070,20 +1095,29 @@
-e 's, at configdir\@,$(configdir),g' \
-e 's, at sysconfdir\@,$(sysconfdir),g' \
-e 's, at localstatedir\@,$(localstatedir),g' \
+ -e 's, at infdir\@,$(infdir),g' \
+ -e 's, at templatedir\@,$(sampledatadir),g' \
-e 's, at package_name\@,$(PACKAGE_NAME),g' \
-e 's, at instconfigdir\@,$(instconfigdir),g' \
+ -e 's, at enable_ldapi\@,$(enable_ldapi),g' \
+ -e 's, at enable_pam_passthru\@,$(enable_pam_passthru),g' \
+ -e 's, at enable_bitwise\@,$(enable_bitwise),g' \
+ -e 's, at enable_dna\@,$(enable_dna),g' \
+ -e 's, at enable_autobind\@,$(enable_autobind),g' \
-e 's, at ECHO_N\@,$(ECHO_N),g' \
-e 's, at ECHO_C\@,$(ECHO_C),g' \
-e 's, at brand\@,$(brand),g' \
-e 's, at capbrand\@,$(capbrand),g' \
-e 's, at vendor\@,$(vendor),g' \
+ -e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
-e 's, at BUILDNUM\@,$(BUILDNUM),g' \
-e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
-e 's, at perldir\@,$(perldir),g' \
-e 's, at defaultuser\@,$(defaultuser),g' \
- -e 's, at defaultgroup\@,$(defaultgroup),g'
+ -e 's, at defaultgroup\@,$(defaultgroup),g' \
+ -e 's, at with_fhs_opt\@, at with_fhs_opt@,g'
endif
%: %.in
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- configure.ac 21 Jun 2007 21:57:22 -0000 1.33
+++ configure.ac 13 Jul 2007 18:35:32 -0000 1.34
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
# This version is the version returned by ns-slapd -v
-AC_INIT([fedora-ds], [1.1.0a3], [http://bugzilla.redhat.com/])
+AC_INIT([fedora-ds], [1.1.0a4], [http://bugzilla.redhat.com/])
# AC_CONFIG_HEADER must be called right after AC_INIT.
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- configure 4 Jul 2007 01:28:17 -0000 1.51
+++ configure 13 Jul 2007 18:35:32 -0000 1.52
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0a3.
+# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0a4.
#
# Report bugs to .
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='fedora-ds'
PACKAGE_TARNAME='fedora-ds'
-PACKAGE_VERSION='1.1.0a3'
-PACKAGE_STRING='fedora-ds 1.1.0a3'
+PACKAGE_VERSION='1.1.0a4'
+PACKAGE_STRING='fedora-ds 1.1.0a4'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -465,7 +465,7 @@
#endif"
ac_default_prefix=/opt/$PACKAGE_NAME
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_bitwise_TRUE enable_bitwise_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -954,7 +954,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures fedora-ds 1.1.0a3 to adapt to many kinds of systems.
+\`configure' configures fedora-ds 1.1.0a4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of fedora-ds 1.1.0a3:";;
+ short | recursive ) echo "Configuration of fedora-ds 1.1.0a4:";;
esac
cat <<\_ACEOF
@@ -1201,7 +1201,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-fedora-ds configure 1.1.0a3
+fedora-ds configure 1.1.0a4
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1215,7 +1215,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by fedora-ds $as_me 1.1.0a3, which was
+It was created by fedora-ds $as_me 1.1.0a4, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1861,7 +1861,7 @@
# Define the identity of the package.
PACKAGE='fedora-ds'
- VERSION='1.1.0a3'
+ VERSION='1.1.0a4'
cat >>confdefs.h <<_ACEOF
@@ -23119,6 +23119,7 @@
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
+
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
@@ -25680,7 +25681,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by fedora-ds $as_me 1.1.0a3, which was
+This file was extended by fedora-ds $as_me 1.1.0a4, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25743,7 +25744,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-fedora-ds config.status 1.1.0a3
+fedora-ds config.status 1.1.0a4
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -26022,6 +26023,7 @@
s, at enable_ldapi_FALSE@,$enable_ldapi_FALSE,;t t
s, at enable_bitwise_TRUE@,$enable_bitwise_TRUE,;t t
s, at enable_bitwise_FALSE@,$enable_bitwise_FALSE,;t t
+s, at with_fhs_opt@,$with_fhs_opt,;t t
s, at configdir@,$configdir,;t t
s, at sampledatadir@,$sampledatadir,;t t
s, at propertydir@,$propertydir,;t t
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Makefile.in 4 Jul 2007 01:28:17 -0000 1.57
+++ Makefile.in 13 Jul 2007 18:35:32 -0000 1.58
@@ -986,6 +986,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
vendor = @vendor@
+with_fhs_opt = @with_fhs_opt@
# look for included m4 files in the ./m4/ directory
ACLOCAL_AMFLAGS = -I m4
@@ -1045,8 +1046,11 @@
# this is how to add optional plugins
@enable_pam_passthru_TRUE at LIBPAM_PASSTHRU_PLUGIN = libpam-passthru-plugin.la
+ at enable_pam_passthru_TRUE@enable_pam_passthru = 1
@enable_dna_TRUE at LIBDNA_PLUGIN = libdna-plugin.la
+ at enable_dna_TRUE@enable_dna = 1
@enable_bitwise_TRUE at LIBBITWISE_PLUGIN = libbitwise-plugin.la
+ at enable_bitwise_TRUE@enable_bitwise = 1
serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la \
libback-ldbm.la libchainingdb-plugin.la libcos-plugin.la libdes-plugin.la \
libdistrib-plugin.la libhttp-client-plugin.la libcollation-plugin.la \
@@ -1082,6 +1086,14 @@
ldap/ldif/template-pampta.ldif \
ldap/ldif/template-dnaplugin.ldif \
ldap/ldif/template-bitwise.ldif \
+ ldap/ldif/template-dse.ldif \
+ ldap/ldif/template-org.ldif \
+ ldap/ldif/template-domain.ldif \
+ ldap/ldif/template-state.ldif \
+ ldap/ldif/template-locality.ldif \
+ ldap/ldif/template-country.ldif \
+ ldap/ldif/template-orgunit.ldif \
+ ldap/ldif/template-baseacis.ldif \
$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-FamilyNames \
$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-GivenNames \
$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-OrgUnits
@@ -1138,7 +1150,8 @@
ldap/admin/src/scripts/Setup.pm \
ldap/admin/src/scripts/Migration.pm \
ldap/admin/src/scripts/DSMigration.pm \
- ldap/admin/src/scripts/FileConn.pm
+ ldap/admin/src/scripts/FileConn.pm \
+ ldap/admin/src/scripts/DSCreate.pm
property_DATA = ldap/admin/src/scripts/setup-ds.res \
ldap/admin/src/scripts/migrate-ds.res
@@ -1154,6 +1167,7 @@
ldap/admin/src/scripts/template-saveconfig \
ldap/admin/src/scripts/template-start-slapd \
ldap/admin/src/scripts/template-stop-slapd \
+ ldap/admin/src/scripts/template-restart-slapd \
ldap/admin/src/scripts/template-suffix2instance \
ldap/admin/src/scripts/template-vlvindex \
ldap/admin/src/scripts/template-bak2db.pl \
@@ -1172,7 +1186,10 @@
$(srcdir)/ldap/admin/src/scripts/template-migrateTo7
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
-inf_DATA = ldap/admin/src/slapd.inf
+inf_DATA = ldap/admin/src/slapd.inf \
+ ldap/admin/src/scripts/dscreate.map \
+ ldap/admin/src/scripts/dsorgentries.map
+
#////////////////////////////////////////////////////////////////
#
@@ -1847,6 +1864,7 @@
# ns-slapd
#------------------------
@enable_ldapi_TRUE at GETSOCKETPEER = ldap/servers/slapd/getsocketpeer.c
+ at enable_ldapi_TRUE@enable_ldapi = 1
ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \
ldap/servers/slapd/auth.c \
ldap/servers/slapd/bind.c \
@@ -1931,20 +1949,29 @@
@BUNDLE_FALSE@ -e 's, at configdir\@,$(configdir),g' \
@BUNDLE_FALSE@ -e 's, at sysconfdir\@,$(sysconfdir),g' \
@BUNDLE_FALSE@ -e 's, at localstatedir\@,$(localstatedir),g' \
+ at BUNDLE_FALSE@ -e 's, at infdir\@,$(infdir),g' \
+ at BUNDLE_FALSE@ -e 's, at templatedir\@,$(sampledatadir),g' \
@BUNDLE_FALSE@ -e 's, at package_name\@,$(PACKAGE_NAME),g' \
@BUNDLE_FALSE@ -e 's, at instconfigdir\@,$(instconfigdir),g' \
+ at BUNDLE_FALSE@ -e 's, at enable_ldapi\@,$(enable_ldapi),g' \
+ at BUNDLE_FALSE@ -e 's, at enable_pam_passthru\@,$(enable_pam_passthru),g' \
+ at BUNDLE_FALSE@ -e 's, at enable_bitwise\@,$(enable_bitwise),g' \
+ at BUNDLE_FALSE@ -e 's, at enable_dna\@,$(enable_dna),g' \
+ at BUNDLE_FALSE@ -e 's, at enable_autobind\@,$(enable_autobind),g' \
@BUNDLE_FALSE@ -e 's, at ECHO_N\@,$(ECHO_N),g' \
@BUNDLE_FALSE@ -e 's, at ECHO_C\@,$(ECHO_C),g' \
@BUNDLE_FALSE@ -e 's, at brand\@,$(brand),g' \
@BUNDLE_FALSE@ -e 's, at capbrand\@,$(capbrand),g' \
@BUNDLE_FALSE@ -e 's, at vendor\@,$(vendor),g' \
+ at BUNDLE_FALSE@ -e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
@BUNDLE_FALSE@ -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
@BUNDLE_FALSE@ -e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
@BUNDLE_FALSE@ -e 's, at BUILDNUM\@,$(BUILDNUM),g' \
@BUNDLE_FALSE@ -e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
@BUNDLE_FALSE@ -e 's, at perldir\@,$(perldir),g' \
@BUNDLE_FALSE@ -e 's, at defaultuser\@,$(defaultuser),g' \
- at BUNDLE_FALSE@ -e 's, at defaultgroup\@,$(defaultgroup),g'
+ at BUNDLE_FALSE@ -e 's, at defaultgroup\@,$(defaultgroup),g' \
+ at BUNDLE_FALSE@ -e 's, at with_fhs_opt\@, at with_fhs_opt@,g'
# these are for the config files and scripts that we need to generate and replace
@@ -1974,20 +2001,29 @@
@BUNDLE_TRUE@ -e 's, at configdir\@,$(configdir),g' \
@BUNDLE_TRUE@ -e 's, at sysconfdir\@,$(sysconfdir),g' \
@BUNDLE_TRUE@ -e 's, at localstatedir\@,$(localstatedir),g' \
+ at BUNDLE_TRUE@ -e 's, at infdir\@,$(infdir),g' \
+ at BUNDLE_TRUE@ -e 's, at templatedir\@,$(sampledatadir),g' \
@BUNDLE_TRUE@ -e 's, at package_name\@,$(PACKAGE_NAME),g' \
@BUNDLE_TRUE@ -e 's, at instconfigdir\@,$(instconfigdir),g' \
+ at BUNDLE_TRUE@ -e 's, at enable_ldapi\@,$(enable_ldapi),g' \
+ at BUNDLE_TRUE@ -e 's, at enable_pam_passthru\@,$(enable_pam_passthru),g' \
+ at BUNDLE_TRUE@ -e 's, at enable_bitwise\@,$(enable_bitwise),g' \
+ at BUNDLE_TRUE@ -e 's, at enable_dna\@,$(enable_dna),g' \
+ at BUNDLE_TRUE@ -e 's, at enable_autobind\@,$(enable_autobind),g' \
@BUNDLE_TRUE@ -e 's, at ECHO_N\@,$(ECHO_N),g' \
@BUNDLE_TRUE@ -e 's, at ECHO_C\@,$(ECHO_C),g' \
@BUNDLE_TRUE@ -e 's, at brand\@,$(brand),g' \
@BUNDLE_TRUE@ -e 's, at capbrand\@,$(capbrand),g' \
@BUNDLE_TRUE@ -e 's, at vendor\@,$(vendor),g' \
+ at BUNDLE_TRUE@ -e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
@BUNDLE_TRUE@ -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
@BUNDLE_TRUE@ -e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
@BUNDLE_TRUE@ -e 's, at BUILDNUM\@,$(BUILDNUM),g' \
@BUNDLE_TRUE@ -e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
@BUNDLE_TRUE@ -e 's, at perldir\@,$(perldir),g' \
@BUNDLE_TRUE@ -e 's, at defaultuser\@,$(defaultuser),g' \
- at BUNDLE_TRUE@ -e 's, at defaultgroup\@,$(defaultgroup),g'
+ at BUNDLE_TRUE@ -e 's, at defaultgroup\@,$(defaultgroup),g' \
+ at BUNDLE_TRUE@ -e 's, at with_fhs_opt\@, at with_fhs_opt@,g'
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
From fedora-directory-commits at redhat.com Fri Jul 13 18:35:35 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 13 Jul 2007 14:35:35 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
DSCreate.pm.in, NONE, 1.1 dscreate.map.in, NONE,
1.1 dsorgentries.map.in, NONE, 1.1 template-restart-slapd.in,
NONE, 1.1 DSMigration.pm.in, 1.3, 1.4 FileConn.pm, 1.2,
1.3 Migration.pm.in, 1.2, 1.3 Util.pm.in, 1.7,
1.8 migrate-ds.pl.in, 1.1, 1.2 migrate-ds.res, 1.2,
1.3 setup-ds.pl.in, 1.5, 1.6 setup-ds.res.in, 1.7, 1.8
Message-ID: <200707131835.l6DIZZdE031232@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31095/ldapserver/ldap/admin/src/scripts
Modified Files:
DSMigration.pm.in FileConn.pm Migration.pm.in Util.pm.in
migrate-ds.pl.in migrate-ds.res setup-ds.pl.in setup-ds.res.in
Added Files:
DSCreate.pm.in dscreate.map.in dsorgentries.map.in
template-restart-slapd.in
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script
Reviewed by: nhosoi (Thanks!)
Fix Description: The time has come. We can finally get rid of the instance creation C code
once and for all. I've created a DSCreate module that has all of the functionality of the old
create_instance.c code, along with a few items from ldap/admin/lib. The way it works is
this: it first creates the dse.ldif file using template-dse.ldif and the suffix-db template to
create the initial db and suffix. It then adds additional optional configuration depending
on what optional features have been enabled. It creates other config files and copies in
the schema. It then initializes the database. It uses a template file based on the type of
entry implied by the suffix, then adds the default ACIs. If the user chose to do so, it
will also create the ou=people, ou=groups, etc. entries. The user can also supply an LDIF
file which will be used to populate the initial database, in which case none of the default
entries or ACIs will be used. It then starts the server (if desired).
I had to create a function makePaths that works like mkdir -p except that it will chown,
chgrp, and chmod all paths created.
I had to change the other places where instance creation was called to use the new
calling semantics. ds_create changed quite a bit, since it can just use an Inf to pass in the
information instead of calling ds_newinst as a CGI program.
I had to change FileConn to add support for namingContexts (i.e. entries with no parent),
and to have it write each change each time, and to return copies of entries when searching,
to avoid modifying the tree in place. This makes it act much more like LDAP.
I found and fixed a few bugs in Migration along the way that were revealed while integrating
the new DSCreate code.
Platforms tested: RHEL4, FC6
Flag Day: Yes. New instance creation code and autotool changes.
Doc impact: no
--- NEW FILE DSCreate.pm.in ---
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
###########################
#
# This perl module provides a way to create a new instance of
# directory server.
#
##########################
package DSCreate;
use Util;
use Inf;
use FileConn;
use Net::Domain qw(hostfqdn);
# tempfiles
use File::Temp qw(tempfile tempdir);
use File::Path;
use File::Copy;
use File::Basename qw(basename);
# load perldap
use Mozilla::LDAP::Conn;
use Mozilla::LDAP::Utils qw(normalizeDN);
use Mozilla::LDAP::API qw(ldap_explode_dn);
use Mozilla::LDAP::LDIF;
use Exporter;
@ISA = qw(Exporter);
@EXPORT = qw(createDSInstance);
@EXPORT_OK = qw(createDSInstance);
use strict;
use SetupLog;
sub checkPort {
my $inf = shift;
# allow port 0 if ldapi is used
if ("@enable_ldapi@") {
if ($inf->{slapd}->{ldapifilepath} &&
($inf->{slapd}->{ServerPort} == 0)) {
return ();
}
}
if (!portAvailable($inf->{slapd}->{ServerPort})) {
return ('error_port_available', $inf->{slapd}->{ServerPort}, $!);
}
return ();
}
# checks the parameters in $inf to make sure the supplied values
# are valid
# returns null if successful, or an error string for use with getText()
sub sanityCheckParams {
my $inf = shift;
my @errs = ();
# if we don't need to start the server right away, we can skip the
# port number checks
if (!defined($inf->{slapd}->{start_server}) or
($inf->{slapd}->{start_server} == 1)) {
if (@errs = checkPort($inf)) {
return @errs;
}
}
if (!isValidServerID($inf->{slapd}->{ServerIdentifier})) {
return ('error_invalid_serverid', $inf->{slapd}->{ServerIdentifier});
} elsif (-d $inf->{slapd}->{config_dir}) {
return ('error_server_already_exists', $inf->{slapd}->{config_dir});
}
if (@errs = isValidUser($inf->{General}->{SuiteSpotUserID})) {
return @errs;
}
if (!isValidDN($inf->{slapd}->{Suffix})) {
return ('dialog_dssuffix_error', $inf->{slapd}->{Suffix});
}
if (!isValidDN($inf->{slapd}->{RootDN})) {
return ('dialog_dsrootdn_error', $inf->{slapd}->{RootDN});
}
if ($inf->{slapd}->{RootDNPwd} =~ /\{\w+\}.+/) {
debug(1, "The root password is already hashed - no checking will be performed\n");
} elsif (length($inf->{slapd}->{RootDNPwd}) < 8) {
debug(0, "WARNING: The root password is less than 8 characters long. You should choose a longer one.\n");
}
return ();
}
sub getMode {
my $inf = shift;
my $mode = shift;
if (defined($inf->{General}->{SuiteSpotGroup})) {
$mode = "0" . $mode . $mode . "0";
} else {
$mode = "0" . $mode . "00";
}
return oct($mode);
}
# This is used to change the ownership and permissions of files and directories
# The mode is just a single digit octal number (e.g. 4 6 7)
# If there is a group, the ownership and permissions will allow group access
# otherwise, only the owner will be allowed access
sub changeOwnerMode {
my $inf = shift;
my $mode = shift;
my $it = shift;
my $uid = getpwnam $inf->{General}->{SuiteSpotUserID};
my $gid = -1; # default to leave it alone
if (defined($inf->{General}->{SuiteSpotGroup})) {
$gid = getgrnam $inf->{General}->{SuiteSpotGroup};
}
$mode = getMode($inf, $mode);
$! = 0; # clear errno
chmod $mode, $it;
if ($!) {
return ('error_chmoding_file', $it, $!);
}
$! = 0; # clear errno
chown $uid, $gid, $it;
if ($!) {
return ('error_chowning_file', $it, $inf->{General}->{SuiteSpotUserID}, $!);
}
return ();
}
sub makeDSDirs {
my $inf = shift;
my $verbose = ($Util::debuglevel > 0);
my $mode = getMode($inf, 7);
my @errs;
# These paths are owned by the SuiteSpotGroup
# This allows the admin server to run as a different,
# more privileged user than the directory server, but
# still allows the admin server to manage directory
# server files/dirs without being root
for (qw(inst_dir config_dir schema_dir log_dir lock_dir run_dir tmp_dir
cert_dir db_dir ldif_dir bak_dir)) {
my $dir = $inf->{slapd}->{$_};
@errs = makePaths($dir, $mode, $inf->{General}->{SuiteSpotUserID},
$inf->{General}->{SuiteSpotGroup});
if (@errs) {
return @errs;
}
}
return @errs;
}
sub createInstanceScripts {
my $inf = shift;
my $myperl = "!/usr/bin/env perl";
my $mydevnull = (-f "/dev/null" ? " /dev/null " : " NUL ");
my %maptable = (
"DS-ROOT" => $inf->{General}->{prefix},
"SEP" => "/", # works on all platforms
"SERVER-NAME" => $inf->{General}->{FullMachineName},
"SERVER-PORT" => $inf->{slapd}->{ServerPort},
"PERL-EXEC" => $myperl,
"DEV-NULL" => $mydevnull,
"ROOT-DN" => $inf->{slapd}->{RootDN},
"LDIF-DIR" => $inf->{slapd}->{ldif_dir},
"SERV-ID" => $inf->{slapd}->{ServerIdentifier},
"BAK-DIR" => $inf->{slapd}->{bak_dir},
"SERVER-DIR" => $inf->{General}->{ServerRoot},
"CONFIG-DIR" => $inf->{slapd}->{config_dir},
"RUN-DIR" => $inf->{slapd}->{run_dir},
"PRODUCT-NAME" => "slapd",
"SERVERBIN-DIR" => $inf->{slapd}->{sbindir},
"DB-DIR" => $inf->{slapd}->{db_dir}
);
my $dir = "$inf->{General}->{prefix}@taskdir@";
for (glob("$dir/template-*")) {
my $basename = $_;
$basename =~ s/^.*template-//;
my $destfile = "$inf->{slapd}->{inst_dir}/$basename";
if (!open(SRC, "< $_")) {
return ("error_opening_scripttmpl", $_, $!);
}
if (!open(DEST, "> $destfile")) {
return ("error_opening_scripttmpl", $destfile, $!);
}
my $contents; # slurp entire file into memory
read SRC, $contents, int(-s $_);
close(SRC);
while (my ($key, $val) = each %maptable) {
$contents =~ s/\{\{$key\}\}/$val/g;
}
print DEST $contents;
close(DEST);
my @errs = changeOwnerMode($inf, 5, $destfile);
if (@errs) {
return @errs;
}
}
return ();
}
sub createConfigFile {
my $inf = shift;
my $conffile = "$inf->{slapd}->{config_dir}/dse.ldif";
my $conn = new FileConn;
my @errs;
# first, create the basic config
my $mapper = new Inf("$inf->{General}->{prefix}@infdir@/dscreate.map");
my $dsinf = new Inf("$inf->{General}->{prefix}@infdir@/slapd.inf");
if (!$inf->{slapd}->{ds_bename}) {
$inf->{slapd}->{ds_bename} = "userRoot"; # for suffix-db
}
$mapper = process_maptbl($mapper, \@errs, $inf, $dsinf);
if (!$mapper or @errs) {
$conn->close();
if (!@errs) {
@errs = ('error_creating_file', $conffile, $!);
}
return @errs;
}
my @ldiffiles = ("$inf->{General}->{prefix}@templatedir@/template-dse.ldif",
"$inf->{General}->{prefix}@templatedir@/template-suffix-db.ldif");
if ("@enable_pam_passthru@") {
push @ldiffiles, "$inf->{General}->{prefix}@templatedir@/template-pampta.ldif";
}
if ("@enable_bitwise@") {
push @ldiffiles, "$inf->{General}->{prefix}@templatedir@/template-bitwise.ldif";
}
if ("@enable_dna@") {
push @ldiffiles, "$inf->{General}->{prefix}@templatedir@/template-dnaplugin.ldif";
}
getMappedEntries($mapper, \@ldiffiles, \@errs, \&check_and_add_entry,
[$conn]);
if (@errs) {
$conn->close();
return @errs;
}
if ("@enable_ldapi@") {
my $ent = $conn->search("cn=config", "base", "(objectclass=*)");
if (defined($inf->{slapd}->{ldapifilepath})) {
$ent->setValues("nsslapd-ldapifilepath", $inf->{slapd}->{ldapifilepath});
$ent->setValues("nsslapd-ldapilisten", "on");
} else {
$ent->setValues("nsslapd-ldapifilepath",
"$inf->{slapd}->{run_dir}/slapd-$inf->{slapd}->{ServerIdentifier}.socket");
$ent->setValues("nsslapd-ldapilisten", "off");
}
if ("@enable_autobind@") {
$ent->setValues("nsslapd-ldapiautobind", "on");
}
$ent->setValues("nsslapd-ldapimaprootdn", $inf->{slapd}->{RootDN});
$ent->setValues("nsslapd-ldapimaptoentries", "off");
$ent->setValues("nsslapd-ldapiuidnumbertype", "uidNumber");
$ent->setValues("nsslapd-ldapigidnumbertype", "gidNumber");
$ent->setValues("nsslapd-ldapientrysearchbase", "dc=example, dc=com");
$ent->setValues("nsslapd-ldapiautodnsuffix", "cn=peercred,cn=external,cn=auth");
if (!$conn->update($ent)) {
$conn->close();
return ("error_enabling_feature", "ldapi", $conn->getErrorString());
}
}
if ($inf->{slapd}->{sasl_path}) {
my $ent = $conn->search("cn=config", "base", "(objectclass=*)");
$ent->setValues("nsslapd-saslpath", $inf->{slapd}->{sasl_path});
if (!$conn->update($ent)) {
$conn->close();
return ("error_enabling_feature", "sasl_path", $conn->getErrorString());
}
}
$conn->write($conffile);
$conn->close();
if (@errs = changeOwnerMode($inf, 6, $conffile)) {
return @errs;
}
# make a copy
my $origconf = "$inf->{slapd}->{config_dir}/dse_original.ldif";
$! = 0; # clear errno
copy($conffile, $origconf);
if ($!) {
return ('error_copying_file', $conffile, $origconf, $!);
}
if (@errs = changeOwnerMode($inf, 4, $origconf)) {
return @errs;
}
return @errs;
}
sub makeOtherConfigFiles {
my $inf = shift;
my @errs;
# install certmap.conf at
my $src = "$inf->{General}->{prefix}@configdir@/certmap.conf";
my $dest = "$inf->{slapd}->{config_dir}/certmap.conf";
$! = 0; # clear errno
copy($src, $dest);
if ($!) {
return ('error_copying_file', $src, $dest, $!);
}
if (@errs = changeOwnerMode($inf, 4, $dest)) {
return @errs;
}
$src = "$inf->{General}->{prefix}@configdir@/slapd-collations.conf";
$dest = "$inf->{slapd}->{config_dir}/slapd-collations.conf";
$! = 0; # clear errno
copy($src, $dest);
if ($!) {
return ('error_copying_file', $src, $dest, $!);
}
if (@errs = changeOwnerMode($inf, 4, $dest)) {
return @errs;
}
return ();
}
sub installSchema {
my $inf = shift;
my @errs;
my @schemafiles = ();
if (!defined($inf->{slapd}->{install_full_schema}) or
$inf->{slapd}->{install_full_schema}) {
push @schemafiles, glob("$inf->{General}->{prefix}@schemadir@/*");
} else {
push @schemafiles, "$inf->{General}->{prefix}@schemadir@/00core.ldif";
}
for (@schemafiles) {
my $src = $_;
my $basename = basename($src);
my $dest = "$inf->{slapd}->{schema_dir}/$basename";
$! = 0; # clear errno
copy($src, $dest);
if ($!) {
return ('error_copying_file', $src, $dest, $!);
}
my $mode = 4; # default read only
if ($basename eq "99user.ldif") {
$mode = 6; # read write
}
if (@errs = changeOwnerMode($inf, $mode, $dest)) {
return @errs;
}
}
return ();
}
# maps the suffix attr to the filename to use
my %suffixTable = (
'o' => "@templatedir@/template-org.ldif",
'dc' => "@templatedir@/template-domain.ldif",
'ou' => "@templatedir@/template-orgunit.ldif",
'st' => "@templatedir@/template-state.ldif",
'l' => "@templatedir@/template-locality.ldif",
'c' => "@templatedir@/template-country.ldif"
);
sub initDatabase {
my $inf = shift;
# If the user has specified an LDIF file to use to initialize the database,
# load it now
my $ldiffile = $inf->{slapd}->{InstallLdifFile};
if ($ldiffile && -f $ldiffile) {
debug(1, "Loading initial ldif file $ldiffile\n");
} elsif (($inf->{slapd}->{Suffix} =~ /^(.*?)=/) && $suffixTable{$1}) {
my @errs;
my $template = $inf->{General}->{prefix} . $suffixTable{$1};
my $mapper = new Inf("$inf->{General}->{prefix}@infdir@/dsorgentries.map");
my $dsinf = new Inf("$inf->{General}->{prefix}@infdir@/slapd.inf");
my @rdns = ldap_explode_dn($inf->{slapd}->{Suffix}, 1);
$inf->{slapd}->{naming_value} = $rdns[0];
$mapper = process_maptbl($mapper, \@errs, $inf, $dsinf);
if (!$mapper or @errs) {
return @errs;
}
my @ldiffiles = ($template, "$inf->{General}->{prefix}@templatedir@/template-baseacis.ldif");
if (exists($inf->{slapd}->{InstallLdifFile}) and
($inf->{slapd}->{InstallLdifFile} =~ /suggest/i)) {
push @ldiffiles, "$inf->{General}->{prefix}@templatedir@/template.ldif";
}
my ($fh, $templdif) = tempfile("ldifXXXXXX", SUFFIX => ".ldif", OPEN => 0,
DIR => File::Spec->tmpdir);
my $conn = new FileConn;
$conn->setNamingContext($inf->{slapd}->{Suffix});
getMappedEntries($mapper, \@ldiffiles, \@errs, \&check_and_add_entry,
[$conn]);
$conn->write($templdif);
$conn->close();
if (@errs) {
return @errs;
}
# $templdif now contains the ldif to import
$ldiffile = $templdif;
}
if (!$ldiffile) {
return ();
}
my $cmd = "$inf->{slapd}->{inst_dir}/ldif2db -n userRoot -i \'$ldiffile\'";
$? = 0; # clear error condition
my $output = `$cmd 2>&1`;
if ($?) {
return ('error_importing_ldif', $ldiffile, $?, $output);
}
debug(1, $output);
return ();
}
sub startServer {
my $inf = shift;
return () if (defined($inf->{slapd}->{start_server}) && !$inf->{slapd}->{start_server});
my @errs;
# get error log
my $errLog = "$inf->{slapd}->{log_dir}/errors";
my $startcmd = "$inf->{slapd}->{inst_dir}/start-slapd";
# emulate tail -f
# if the last line we see does not contain "slapd started", try again
my $done = 0;
my $started = 0;
my $code = 0;
my $lastLine = "";
my $cmdPat = 'slapd started\.';
my $timeout = $inf->{slapd}->{startup_timeout};
$timeout = $timeout?$timeout:600; # default is 10 minutes
$timeout = time + $timeout;
debug(1, "Starting the server: $startcmd\n");
$? = 0; # clear error condition
my $output = `$startcmd 2>&1`;
$code = $?;
debug(1, "Started the server: code $code\n");
if ($code) {
debug(0, $output);
} else {
debug(1, $output);
}
# try to open the server error log
my $ii = 0;
while (time < $timeout) {
if (open(IN, $errLog)) {
last;
}
sleep(1);
if (!($ii % 10)) {
debug(0, "Attempting to obtain server status . . .\n");
}
++$ii;
}
if (! -f $errLog) {
debug(0, "Error: Could not read error log $errLog to get server startup status. Error: $!\n");
return ('error_starting_server', $startcmd, "no status", $!);
}
if (time >= $timeout) {
debug(0, "Error: timed out waiting for the server to start and write to $errLog");
return ('error_starting_server', $startcmd, "timeout", 0);
}
my $pos = tell(IN);
while (($done == 0) && (time < $timeout)) {
for (; ($done == 0) && ($_ = ); $pos = tell(IN)) {
$lastLine = $_;
debug(1, $_);
if (/$cmdPat/) {
$done = 1;
$started = 1;
} elsif (/Initialization Failed/) {
debug(1, "Server failed to start, retrying . . .\n");
$code = system($startcmd);
} elsif (/exiting\./) {
debug(1, "Server failed to start, retrying . . .\n");
$code = system($startcmd);
}
}
if ($lastLine =~ /PR_Bind/) {
# server port conflicts with another one, just report and punt
debug(0, $lastLine);
@errs = ('error_port_available', $inf->{slapd}->{ServerPort}, $!);
$done = 1;
}
if ($done == 0) {
# rest a bit, then . . .
sleep(2);
# . . . reset the EOF status of the file desc
seek(IN, $pos, 0);
}
}
close(IN);
if (!$started) {
$! = $code;
my $now = time;
if ($now > $timeout) {
debug(0, "Possible timeout starting server: timeout=$timeout now=$now\n");
}
@errs = ('error_starting_server', $startcmd, $lastLine, $!);
} else {
debug(1, "Your new directory server has been started.\n");
}
return @errs;
}
sub set_path_attribute {
my $val = shift;
my $defaultval = shift;
my $prefix = shift;
if ($val) {
return "$prefix" . "$val";
} else {
return "$prefix" . "$defaultval";
}
}
sub setDefaults {
my $inf = shift;
# set default values
# this turns off the warnings
if (!defined($inf->{General}->{prefix})) {
$inf->{General}->{prefix} = "";
}
if (!$inf->{General}->{FullMachineName}) {
$inf->{General}->{FullMachineName} = hostfqdn;
}
if (!$inf->{General}->{SuiteSpotUserID}) {
if ($> != 0) { # if not root, use the user's uid
$inf->{General}->{SuiteSpotUserID} = getlogin;
}
# otherwise, the uid must be specified
}
if (!$inf->{slapd}->{RootDN}) {
$inf->{slapd}->{RootDN} = "cn=Directory Manager";
}
if (!$inf->{slapd}->{Suffix}) {
my $suffix = $inf->{General}->{FullMachineName};
# convert fqdn to dc= domain components
$suffix =~ s/^[^\.]*\.//; # just the domain part
$suffix = "dc=$suffix";
$suffix =~ s/\./, dc=/g;
$inf->{slapd}->{Suffix} = $suffix;
}
if (!$inf->{slapd}->{ServerIdentifier}) {
my $servid = $inf->{General}->{FullMachineName};
# strip out the leftmost domain component
$servid =~ s/\..*$//;
$inf->{slapd}->{ServerIdentifier} = $servid;
}
if ("@with_fhs_opt@") {
$inf->{General}->{ServerRoot} = "$inf->{General}->{prefix}/opt/@PACKAGE_NAME@";
} else {
$inf->{General}->{ServerRoot} = "$inf->{General}->{prefix}@serverdir@";
}
if (!defined($inf->{slapd}->{sasl_path})) {
if ($ ne "linux") {
$inf->{slapd}->{sasl_path} = "$inf->{General}->{prefix}@libdir@/sasl2";
}
}
if (!defined($inf->{slapd}->{ServerPort}) and
!defined($inf->{slapd}->{ldapifilepath})) {
if ("@enable_ldapi@") {
return ('error_missing_port_and_ldapi');
} else {
return ('error_missing_port');
}
}
if (!defined($inf->{slapd}->{ServerPort})) {
$inf->{slapd}->{ServerPort} = 0;
}
$inf->{slapd}->{HashedRootDNPwd} = getHashedPassword($inf->{slapd}->{RootDNPwd});
$inf->{slapd}->{localstatedir} = set_path_attribute($inf->{slapd}->{localstatedir},
"@localstatedir@",
$inf->{General}->{prefix});
my $localstatedir = $inf->{slapd}->{localstatedir};
my $servid = $inf->{slapd}->{ServerIdentifier};
$inf->{slapd}->{sysconfdir} = set_path_attribute($inf->{slapd}->{sysconfdir},
"@sysconfdir@",
$inf->{General}->{prefix});
my $sysconfdir = $inf->{slapd}->{sysconfdir};
$inf->{slapd}->{bindir} = set_path_attribute($inf->{slapd}->{bindir},
"@bindir@",
$inf->{General}->{prefix});
$inf->{slapd}->{sbindir} = set_path_attribute($inf->{slapd}->{sbindir},
"@sbindir@",
$inf->{General}->{prefix});
$inf->{slapd}->{datadir} = set_path_attribute($inf->{slapd}->{datadir},
"@datadir@",
$inf->{General}->{prefix});
if (!defined($inf->{slapd}->{inst_dir})) {
$inf->{slapd}->{inst_dir} = "$inf->{General}->{ServerRoot}/slapd-$servid";
}
if (!defined($inf->{slapd}->{config_dir})) {
$inf->{slapd}->{config_dir} = "$inf->{General}->{prefix}@instconfigdir@/slapd-$servid";
}
$ENV{DS_CONFIG_DIR} = $inf->{slapd}->{config_dir};
if (!defined($inf->{slapd}->{schema_dir})) {
$inf->{slapd}->{schema_dir} = "$sysconfdir/@PACKAGE_NAME@/slapd-$servid/schema";
}
if (!defined($inf->{slapd}->{lock_dir})) {
if ("@with_fhs_opt@") {
$inf->{slapd}->{lock_dir} = "$localstatedir/@PACKAGE_NAME@/slapd-$servid/lock";
} else {
$inf->{slapd}->{lock_dir} = "$localstatedir/lock/@PACKAGE_NAME@/slapd-$servid";
}
}
if (!defined($inf->{slapd}->{log_dir})) {
if ("@with_fhs_opt@") {
$inf->{slapd}->{log_dir} = "$localstatedir/@PACKAGE_NAME@/slapd-$servid/log";
} else {
$inf->{slapd}->{log_dir} = "$localstatedir/log/@PACKAGE_NAME@/slapd-$servid";
}
}
if (!defined($inf->{slapd}->{run_dir})) {
if ("@with_fhs_opt@") {
$inf->{slapd}->{run_dir} = "$localstatedir/@PACKAGE_NAME@/slapd-$servid/run";
} else {
$inf->{slapd}->{run_dir} = "$localstatedir/run/@PACKAGE_NAME@";
}
}
$ENV{DS_RUN_DIR} = $inf->{slapd}->{run_dir};
if (!defined($inf->{slapd}->{db_dir})) {
if ("@with_fhs_opt@") {
$inf->{slapd}->{db_dir} = "$localstatedir/@PACKAGE_NAME@/slapd-$servid/db";
} else {
$inf->{slapd}->{db_dir} = "$localstatedir/lib/@PACKAGE_NAME@/slapd-$servid/db";
}
}
if (!defined($inf->{slapd}->{bak_dir})) {
if ("@with_fhs_opt@") {
$inf->{slapd}->{bak_dir} = "$localstatedir/@PACKAGE_NAME@/slapd-$servid/bak";
} else {
$inf->{slapd}->{bak_dir} = "$localstatedir/lib/@PACKAGE_NAME@/slapd-$servid/bak";
}
}
$ENV{DS_BAK_DIR} = $inf->{slapd}->{bak_dir};
if (!defined($inf->{slapd}->{ldif_dir})) {
if ("@with_fhs_opt@") {
$inf->{slapd}->{ldif_dir} = "$localstatedir/@PACKAGE_NAME@/slapd-$servid/ldif";
} else {
$inf->{slapd}->{ldif_dir} = "$localstatedir/lib/@PACKAGE_NAME@/slapd-$servid/ldif";
}
}
if (!defined($inf->{slapd}->{tmp_dir})) {
if ("@with_fhs_opt@") {
$inf->{slapd}->{tmp_dir} = "$localstatedir/@PACKAGE_NAME@/slapd-$servid/tmp";
} else {
$inf->{slapd}->{tmp_dir} = "$localstatedir/tmp/@PACKAGE_NAME@/slapd-$servid";
}
}
$ENV{DS_TMP_DIR} = $inf->{slapd}->{tmp_dir};
if (!defined($inf->{slapd}->{cert_dir})) {
$inf->{slapd}->{cert_dir} = $inf->{slapd}->{config_dir};
}
return ();
}
sub createDSInstance {
my $inf = shift;
my @errs;
if (@errs = setDefaults($inf)) {
return @errs;
}
if (@errs = sanityCheckParams($inf)) {
return @errs;
}
if (@errs = makeDSDirs($inf)) {
return @errs;
}
if (@errs = createConfigFile($inf)) {
return @errs;
}
if (@errs = makeOtherConfigFiles($inf)) {
return @errs;
}
if (@errs = createInstanceScripts($inf)) {
return @errs;
}
if (@errs = installSchema($inf)) {
return @errs;
}
if (@errs = initDatabase($inf)) {
return @errs;
}
if (@errs = startServer($inf)) {
return @errs;
}
return @errs;
}
1;
# emacs settings
# Local Variables:
# mode:perl
# indent-tabs-mode: nil
# tab-width: 4
# End:
--- NEW FILE dscreate.map.in ---
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# [Parameter resolution rules]
# * If the right-hand value is in ` (backquote), the value is eval'ed by perl.
# The output should be stored in $returnvalue to pass to the internal hash.
# * If the right-hand value is in " (doublequote), the value is passed as is.
# * If the right-hand value is not in any quote, the value should be found
# in either of the setup inf file (static) or the install inf file (dynamic).
# * Variables surrounded by @ (e.g., @configdir@) are replaced with the
# system path at the compile time.
# * The right-hand value can contain variables surrounded by % (e.g., %asid%)
# which refers the right-hand value (key) of this map file.
#
fqdn = FullMachineName
dsid = ServerIdentifier
ds_user = SuiteSpotUserID
ds_port = ServerPort
rootdn = RootDN
ds_suffix = Suffix
ds_bename = ds_bename
ds_passwd = HashedRootDNPwd
schema_dir = schema_dir
lock_dir = lock_dir
tmp_dir = tmp_dir
cert_dir = cert_dir
ldif_dir = ldif_dir
bak_dir = bak_dir
inst_dir = inst_dir
log_dir = log_dir
config_dir = config_dir
db_dir = db_dir
--- NEW FILE dsorgentries.map.in ---
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# [Parameter resolution rules]
# * If the right-hand value is in ` (backquote), the value is eval'ed by perl.
# The output should be stored in $returnvalue to pass to the internal hash.
# * If the right-hand value is in " (doublequote), the value is passed as is.
# * If the right-hand value is not in any quote, the value should be found
# in either of the setup inf file (static) or the install inf file (dynamic).
# * Variables surrounded by @ (e.g., @configdir@) are replaced with the
# system path at the compile time.
# * The right-hand value can contain variables surrounded by % (e.g., %asid%)
# which refers the right-hand value (key) of this map file.
#
ds_suffix = Suffix
naming_value = naming_value
--- NEW FILE template-restart-slapd.in ---
#!/bin/sh
# Script that restarts the ns-slapd server.
# Exit status can be:
# 0: Server restarted successfully
# 1: Server could not be started
# 2: Server started successfully (was not running)
# 3: Server could not be stopped
server_already_stopped=0
{{INST-DIR}}/stop-slapd
status=$?
if [ $status -eq 1 ] ; then
exit 3;
else
if [ $status -eq 2 ] ; then
server_already_stopped=1
fi
fi
{{INST-DIR}}/start-slapd
status=$?
if [ $server_already_stopped -eq 1 ] && [ $status -eq 0 ] ; then
exit 2;
fi
exit $status
Index: DSMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSMigration.pm.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSMigration.pm.in 12 Jul 2007 13:52:42 -0000 1.3
+++ DSMigration.pm.in 13 Jul 2007 18:35:32 -0000 1.4
@@ -50,6 +50,7 @@
use Migration;
use Util;
use Inf;
+use DSCreate;
# tempfiles
use File::Temp qw(tempfile tempdir);
@@ -91,6 +92,7 @@
'nsslapd-certdir' => 'nsslapd-certdir',
'nsslapd-ldifdir' => 'nsslapd-ldifdir',
'nsslapd-bakdir' => 'nsslapd-bakdir',
+ 'nsslapd-instancedir' => 'nsslapd-instancedir',
'nsslapd-ldapifilepath' => 'nsslapd-ldapifilepath',
'nsslapd-ldapilisten' => 'nsslapd-ldapilisten',
'nsslapd-ldapiautobind' => 'nsslapd-ldapiautobind',
@@ -187,19 +189,28 @@
return ("error_dbsrcdir_not_exist", $srcdir);
} else {
debug(1, "The destination directory $destdir already exists, copying files/dirs individually\n");
+ $! = 0;
+ debug(1, "Removing any existing db files in $destdir\n");
+ unlink glob("$destdir/*");
+ if ($!) {
+ return ("error_removing_temp_db_files", $destdir, $!);
+ }
foreach my $file (glob("$srcdir/*")) {
- debug(3, "Copying $file to $destdir\n");
if (-f $file) {
+ debug(3, "Copying $file to $destdir\n");
if (system ("cp -p $file $destdir")) {
return ('error_copying_dbfile', $file, $destdir, $?);
}
} elsif (-d $file && !$filesonly) {
+ debug(3, "Copying $file to $destdir\n");
if (system ("cp -p -r $file $destdir")) {
return ('error_copying_dbdir', $file, $destdir, $?);
}
}
}
}
+
+ return ();
}
# migrate all of the databases in an instance
@@ -216,11 +227,14 @@
my $foundldif;
for (glob("$mig->{oldsroot}/$inst/db/*.ldif")) {
my $dbname = basename($_, '.ldif');
- my @cmd = ("@serverdir@/$inst/ldif2db", "-n", $dbname, "-i", $_);
- debug(1, "migrateDatabases: executing command ", @cmd);
- if (system(@cmd)) {
- return ('error_importing_migrated_db', $_, $?);
+ my $cmd = "@serverdir@/$inst/ldif2db -n \"$dbname\" -i \"$_\"";
+ debug(1, "migrateDatabases: executing command $cmd\n");
+ $? = 0; # clear error condition
+ my $output = `$cmd 2>&1`;
+ if ($?) {
+ return ('error_importing_migrated_db', $_, $?, $output);
}
+ debug(1, $output);
$foundldif = 1;
}
@@ -284,13 +298,13 @@
my $srcdir = $dir || "$olddefault/db/$cn";
my $newent = $dest->search($ent->getDN(), "base", "(objectclass=*)");
my $newdbdir = $newent->getValues('nsslapd-directory') ||
- "@localstatedir@/lib/$mig->{pkgname}/$inst/db";
+ "@localstatedir@/lib/$mig->{pkgname}/$inst/db/$cn";
if (-d $srcdir and ($srcdir !~ /^$olddefault/)) {
debug(2, "Not copying database indexes from [$srcdir]\n");
} else {
# replace the old sroot value with the actual physical location on the target/dest
$srcdir =~ s/^$mig->{actualsroot}/$mig->{oldsroot}/;
- if (@errs = copyDatabaseDirs($srcdir, "$newdbdir/$cn")) {
+ if (@errs = copyDatabaseDirs($srcdir, "$newdbdir")) {
return @errs;
}
}
@@ -317,9 +331,14 @@
# replace the old sroot value with the actual physical location on the target/dest
$oldcldir =~ s/^$mig->{actualsroot}/$mig->{oldsroot}/;
my $newcldir = $newent->getValues('nsslapd-changelogdir');
- copyDatabaseDirs($oldcldir, $newcldir);
+ my @errs = copyDatabaseDirs($oldcldir, $newcldir);
+ if (@errs) {
+ return @errs;
+ }
}
}
+
+ return ();
}
sub fixAttrsInEntry {
@@ -358,27 +377,37 @@
# iterate through the attr lists
my $cn = lc $new->getValues("cn");
foreach my $attr (keys %inoldonly, keys %innewonly, @attrs) {
+ debug(3, "mergeEntries: merging entry ", $old->getDN(), " attr $attr\n");
my $lcattr = lc $attr;
if ($ignoreOld{$lcattr}) {
+ debug(3, "mergeEntries: ignoring old invalid or obsolete attr $attr\n");
next; # use new value or just omit if attr is obsolete
} elsif ($transformAttr{$lcattr}) {
# only transform if the value is in the old entry
if (!$innewonly{$attr}) {
- $new->setValues($attr, &{$transformAttr{$lcattr}}($old, $attr, $mig, $inst));
+ my $oldval = $old->getValues($attr);
+ my $newval = &{$transformAttr{$lcattr}}($old, $attr, $mig, $inst);
+ $new->setValues($attr, $newval);
+ debug(3, "mergeEntries: transformed old value $oldval to $newval\n");
}
} elsif ($cn eq "internationalization plugin" and $lcattr eq "nsslapd-pluginarg0") {
+ debug(3, "mergeEntries: using new value of internationalization plugin nsslapd-pluginarg0\n");
next; # use the new value of this path name
} elsif ($cn eq "referential integrity postoperation" and $lcattr eq "nsslapd-pluginarg1") {
+ debug(3, "mergeEntries: using new value of referential integrity postoperation nsslapd-pluginarg1\n");
next; # use the new value of this path name
} elsif ($innewonly{$attr}) {
+ debug(3, "mergeEntries: removing attr $attr from new entry\n");
$new->remove($attr); # in new but not old - just remove it
} else {
+ my $oldval = $old->getValues($attr);
+ my $newval = $new->getValues($attr);
$new->setValues($attr, $old->getValues($attr)); # use old value
+ debug(3, "mergeEntries: using old val $oldval instead of new val $newval\n");
}
}
}
-
my @allattrlist = ('*', 'aci', 'createTimestamp', 'creatorsName',
'modifyTimestamp', 'modifiersName');
@@ -598,14 +627,14 @@
}
# create the new instance
- my ($rc, $output) = createDSInstance($inf, \@errs);
+ @errs = createDSInstance($inf);
unlink($inf->{filename});
- if ($rc) {
+ if (@errs) {
$mig->msg(@errs);
- $mig->msg($FATAL, 'error_creating_dsinstance', $rc, $output);
+ $mig->msg($FATAL, 'error_creating_dsinstance', $inst);
return 0;
} else {
- $mig->msg('created_dsinstance', $output);
+ $mig->msg('created_dsinstance', $inst);
}
my $src = new FileConn("$oldconfigdir/dse.ldif", 1); # read-only
@@ -627,3 +656,10 @@
# Mandatory TRUE return value.
#
1;
+
+# emacs settings
+# Local Variables:
+# mode:perl
+# indent-tabs-mode: nil
+# tab-width: 4
+# End:
Index: FileConn.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/FileConn.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileConn.pm 12 Jul 2007 13:52:42 -0000 1.2
+++ FileConn.pm 13 Jul 2007 18:35:32 -0000 1.3
@@ -46,6 +46,8 @@
use Mozilla::LDAP::Utils qw(normalizeDN);
use Mozilla::LDAP::LDIF;
+use Carp;
+
require Exporter;
@ISA = qw(Exporter Mozilla::LDAP::Conn);
@EXPORT = qw();
@@ -55,11 +57,16 @@
my $class = shift;
my $filename = shift;
my $readonly = shift;
+ my @namingContexts = @_;
my $self = {};
$self = bless $self, $class;
$self->{readonly} = $readonly;
+ for (@namingContexts) {
+ $self->setNamingContext($_);
+ }
+ $self->setNamingContext(""); # root DSE
$self->read($filename);
return $self;
@@ -86,16 +93,31 @@
return;
}
- open( MYLDIF, "$filename" ) || die "Can't open $filename: $!";
+ open( MYLDIF, "$filename" ) || confess "Can't open $filename: $!";
my $in = new Mozilla::LDAP::LDIF(*MYLDIF);
+ $self->{reading} = 1;
while ($ent = readOneEntry $in) {
if (!$self->add($ent)) {
- die "Error: could not add entry ", $ent->getDN(), ":", $self->getErrorString();
+ confess "Error: could not add entry ", $ent->getDN(), ":", $self->getErrorString();
}
}
+ delete $self->{reading};
close( MYLDIF );
}
+sub setNamingContext {
+ my $self = shift;
+ my $nc = shift;
+ my $ndn = normalizeDN($nc);
+ $self->{namingContexts}->{$ndn} = $ndn;
+}
+
+sub isNamingContext {
+ my $self = shift;
+ my $ndn = shift;
+ return exists($self->{namingContexts}->{$ndn});
+}
+
# return all nodes below the given node
sub iterate {
my $self = shift;
@@ -152,12 +174,16 @@
$filename = $self->{filename};
}
- if (!$self->{filename} or $self->{readonly}) {
+ if (!$self->{filename} or $self->{readonly} or $self->{reading}) {
return;
}
- open( MYLDIF, ">$filename" ) || die "Can't write $filename: $!";
+ open( MYLDIF, ">$filename" ) || confess "Can't write $filename: $!";
$self->iterate("", LDAP_SCOPE_SUBTREE, \&writecb, \*MYLDIF);
+ for (keys %{$self->{namingContexts}}) {
+ next if (!$_); # skip "" - we already did that
+ $self->iterate($_, LDAP_SCOPE_SUBTREE, \&writecb, \*MYLDIF);
+ }
close( MYLDIF );
}
@@ -307,9 +333,30 @@
return $self->nextEntry();
}
+sub cloneEntry {
+ my $src = shift;
+ if (!$src) {
+ return undef;
+ }
+ my $dest = new Mozilla::LDAP::Entry();
+ $dest->setDN($src->getDN());
+ for (keys %{$src}) {
+ if (ref($src->{$_})) {
+ my @copyary = @{$src->{$_}};
+ $dest->{$_} = [ @copyary ]; # make a deep copy
+ } else {
+ $dest->{$_} = $src->{$_};
+ }
+ }
+
+ return $dest;
+}
+
+# have to return a copy of the entry - disallow inplace updates
sub nextEntry {
my $self = shift;
- return shift @{$self->{entries}};
+ my $ent = shift @{$self->{entries}};
+ return cloneEntry($ent);
}
sub add {
@@ -320,10 +367,9 @@
my $parentdn = getParentDN($dn);
my $nparentdn = normalizeDN($parentdn);
-
$self->setErrorCode(0);
- # special case of root DSE
- if (!$ndn and exists($self->{$ndn}) and
+ # special case of naming context - has no parent
+ if ($self->isNamingContext($ndn) and
!exists($self->{$ndn}->{data})) {
$self->{$ndn}->{data} = $entry;
$self->write();
@@ -357,6 +403,8 @@
my $dn = $entry->getDN();
my $ndn = normalizeDN($dn);
+ confess "Attempt to modify read only $self->{filename} entry $dn" if ($self->{readonly});
+
$self->setErrorCode(0);
if (!exists($self->{$ndn})) {
$self->setErrorCode(LDAP_NO_SUCH_OBJECT);
@@ -373,6 +421,8 @@
my $self = shift;
my $dn = shift;
+ confess "Attempt to modify read only $self->{filename} entry $dn" if ($self->{readonly});
+
if (ref($dn)) {
$dn = $dn->getDN(); # an Entry
}
Index: Migration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Migration.pm.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Migration.pm.in 12 Jul 2007 13:52:42 -0000 1.2
+++ Migration.pm.in 13 Jul 2007 18:35:32 -0000 1.3
@@ -217,7 +217,7 @@
$self->{pkgname} = $pkgname;
$self->{oldsroot} = $oldsroot || "/opt/$oldpkgname";
- $self->{actualsroot} = $actualsroot || $oldsroot;
+ $self->{actualsroot} = $actualsroot || $self->{oldsroot};
$self->{silent} = $silent;
$self->{inffile} = $inffile;
$self->{keep} = $keep;
Index: Util.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Util.pm.in 12 Jul 2007 13:52:42 -0000 1.7
+++ Util.pm.in 13 Jul 2007 18:35:32 -0000 1.8
@@ -47,18 +47,19 @@
@ISA = qw(Exporter);
@EXPORT = qw(portAvailable getAvailablePort isValidDN addSuffix getMappedEntries
process_maptbl check_and_add_entry getMappedEntries
- getHashedPassword debug createDSInstance createInfFromConfig
- isValidServerID);
+ getHashedPassword debug createInfFromConfig
+ isValidServerID isValidUser makePaths);
@EXPORT_OK = qw(portAvailable getAvailablePort isValidDN addSuffix getMappedEntries
process_maptbl check_and_add_entry getMappedEntries
- getHashedPassword debug createDSInstance createInfFromConfig
- isValidServerID);
+ getHashedPassword debug createInfFromConfig
+ isValidServerID isValidUser makePaths);
use strict;
use Socket;
use File::Temp qw(tempfile tempdir);
+use File::Basename qw(dirname);
$Util::debuglevel = 0;
# use like this:
@@ -131,7 +132,7 @@
return ("dialog_ssuser_error", $user);
}
if (!$nuid) {
- return ("dialog_ssuser_root_warning");
+ debug(0, "Warning: using root as the server user id. You are strongly encouraged to use a non-root user.\n");
}
}
@@ -367,13 +368,17 @@
my $attr;
foreach $attr ( @addtypes )
{
- debug(3, "Adding attr=$attr values=" . $aentry->getValues($attr) . " to entry $aentry->{dn}\n");
- $sentry->addValue( $attr, $aentry->getValues($attr) );
+ foreach my $val ($aentry->getValues($attr))
+ {
+ debug(3, "Adding attr=$attr value=$val to entry $aentry->{dn}\n");
+ $sentry->addValue( $attr, $val );
+ }
}
foreach $attr ( @reptypes )
{
+ my @vals = $aentry->getValues($attr);
debug(3, "Replacing attr=$attr values=" . $aentry->getValues($attr) . " to entry $aentry->{dn}\n");
- $sentry->setValues($attr, $aentry->getValues($attr));
+ $sentry->setValues($attr, @vals);
}
foreach $attr ( @deltypes )
{
@@ -761,23 +766,6 @@
return $hashedpwd;
}
-sub createDSInstance {
- my $inf = shift;
- my $errs = shift; # unused for now
-# find ds_newinst.pl - in same directory as this script or in PATH
- my $ds_newinst;
- ($ds_newinst = $0) =~ s|/[^/]+$|/ds_newinst.pl|;
- if (! -x $ds_newinst) {
- $ds_newinst = "@bindir@/ds_newinst.pl";
- }
- if (! -x $ds_newinst) {
- $ds_newinst = "ds_newinst.pl"; # just get from path
- }
- $? = 0; # clear error condition
- my $output = `$ds_newinst $inf->{filename}`;
- return ($?, $output);
-}
-
# this creates an Inf suitable for passing to createDSInstance
# except that it has a bogus suffix
sub createInfFromConfig {
@@ -787,35 +775,93 @@
my $fname = "$configdir/dse.ldif";
my $id;
($id = $inst) =~ s/^slapd-//;
- if (!open( DSELDIF, "$fname" )) {
+ if (! -f $fname) {
push @{$errs}, "error_opening_dseldif", $fname, $!;
return 0;
}
+ my $conn = new FileConn($fname, 1);
+
+ my $ent = $conn->search("cn=config", "base", "(objectclass=*)");
+ if (!$ent) {
+ push @{$errs}, "error_opening_dseldif", $fname, $!;
+ return 0;
+ }
+
my ($outfh, $inffile) = tempfile(SUFFIX => '.inf');
- my $in = new Mozilla::LDAP::LDIF(*DSELDIF) ;
- while (my $ent = readOneEntry $in) {
- my $dn = $ent->getDN();
- if ($dn =~ /cn=config/) {
- print $outfh "[General]\n";
- print $outfh "FullMachineName = ", $ent->getValues('nsslapd-localhost'), "\n";
- print $outfh "SuiteSpotUserID = ", $ent->getValues('nsslapd-localuser'), "\n";
- print $outfh "ServerRoot = @serverdir@\n";
- print $outfh "[slapd]\n";
- print $outfh "RootDN = ", $ent->getValues('nsslapd-rootdn'), "\n";
- print $outfh "RootDNPwd = ", $ent->getValues('nsslapd-rootpw'), "\n";
- print $outfh "ServerPort = ", $ent->getValues('nsslapd-port'), "\n";
- print $outfh "ServerIdentifier = $id\n";
- print $outfh "Suffix = o=deleteAfterMigration\n";
- print $outfh "start_server= 0\n";
- last;
- }
+ print $outfh "[General]\n";
+ print $outfh "FullMachineName = ", $ent->getValues('nsslapd-localhost'), "\n";
+ print $outfh "SuiteSpotUserID = ", $ent->getValues('nsslapd-localuser'), "\n";
+ print $outfh "[slapd]\n";
+ print $outfh "RootDN = ", $ent->getValues('nsslapd-rootdn'), "\n";
+ print $outfh "RootDNPwd = ", $ent->getValues('nsslapd-rootpw'), "\n";
+ print $outfh "ServerPort = ", $ent->getValues('nsslapd-port'), "\n";
+ print $outfh "ServerIdentifier = $id\n";
+ print $outfh "start_server= 0\n";
+
+ my $suffix;
+ my $ent = $conn->search("cn=ldbm database,cn=plugins,cn=config",
+ "one", "(objectclass=*)");
+ if (!$ent) {
+ push @{$errs}, "error_opening_dseldif", $fname, $!;
+ close $outfh;
+ $conn->close();
+ return 0;
+ }
+ # use the userRoot suffix if available
+ while ($ent) {
+ $suffix = $ent->getValues('nsslapd-suffix');
+ last if ($ent->hasValue('cn', 'userRoot', 1));
+ $ent = $conn->nextEntry();
}
+ $conn->close();
+
+ print $outfh "Suffix = $suffix\n";
close $outfh;
- close DSELDIF;
my $inf = new Inf($inffile);
return $inf;
}
+# like File::Path mkpath, except we can set the owner and perm
+# of each new path and parent path created
+sub makePaths {
+ my ($path, $mode, $user, $group) = @_;
+ my $uid = getpwnam $user;
+ my $gid = -1; # default to leave it alone
+
+ if ($group) {
+ $gid = getgrnam $group;
+ }
+ my @dirnames = ($path);
+ my $parent = $path;
+ for ($parent = dirname($parent);
+ $parent and ($parent ne "/");
+ $parent = dirname($parent)) {
+ unshift @dirnames, $parent;
+ }
+ for (@dirnames) {
+ next if (-d $_);
+ $! = 0; # clear
+ mkdir $_, $mode;
+ if ($!) {
+ return ('error_creating_directory', $_, $!);
+ }
+ chown $uid, $gid, $_;
+ if ($!) {
+ return ('error_chowning_directory', $_, $!);
+ }
+ debug(1, "makePaths: created directory $_ mode $mode user $user group $group\n");
+ }
+
+ return ();
+}
+
1;
+
+# emacs settings
+# Local Variables:
+# mode:perl
+# indent-tabs-mode: nil
+# tab-width: 4
+# End:
Index: migrate-ds.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/migrate-ds.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- migrate-ds.pl.in 29 Jun 2007 21:12:21 -0000 1.1
+++ migrate-ds.pl.in 13 Jul 2007 18:35:32 -0000 1.2
@@ -61,5 +61,17 @@
my $mig = new Migration($res);
$mig->msg('begin_ds_migration', $mig->{oldsroot});
-migrateDS($mig);
+if (!migrateDS($mig)) {
+ exit 1;
+}
$mig->msg('end_ds_migration');
+
+END {
+ if ($mig) {
+ if (!$mig->{keep}) {
+ unlink $mig->{inffile};
+ }
+
+ $mig->doExit();
+ }
+}
Index: migrate-ds.res
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/migrate-ds.res,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- migrate-ds.res 12 Jul 2007 13:52:42 -0000 1.2
+++ migrate-ds.res 13 Jul 2007 18:35:32 -0000 1.3
@@ -4,10 +4,11 @@
instance_already_exists = The target directory server instance already exists at %s. Skipping migration. Note that if you want to migrate the old instance you will have to first remove the new one of the same name.\n\n
error_reading_entry = Could not read the entry '%s'. Error: %s\n
error_updating_merge_entry = Could not %s the migrated entry '%s' in the target directory server. Error: %s\n
-error_importing_migrated_db = Could not import the LDIF file '%s' for the migrated database. Error: %s. Please check the directory server error log for more details.\n
+error_importing_migrated_db = Could not import the LDIF file '%s' for the migrated database. Error: %s. Output: %s\n
error_reading_olddbconfig = Could not read the old database configuration information. Error: %s\n
error_migrating_schema = Could not copy old schema file '%s'. Error: %s\n
error_copying_dbdir = Could not copy database directory '%s' to '%s'. Error: %s\n
error_copying_dbfile = Could not copy database file '%s' to '%s'. Error: %s\n
error_dbsrcdir_not_exist = Could not copy from the database source directory '%s' because it does not exist. Please check your configuration.\n
error_no_instances = Could not find any instances in the old directory '%s' to migrate.\n
+error_removing_temp_db_files = Could not remove the temporary db files in '%s' to clear the directory in preparation for the migrated db files. Error: %s\n
Index: setup-ds.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.pl.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- setup-ds.pl.in 12 Jul 2007 13:52:42 -0000 1.5
+++ setup-ds.pl.in 13 Jul 2007 18:35:32 -0000 1.6
@@ -47,6 +47,7 @@
use Resource;
use DialogManager;
use Util;
+use DSCreate;
my $res = new Resource("@propertydir@/setup-ds.res");
@@ -70,13 +71,14 @@
$setup->{inf}->write();
}
-my @errs;
-my ($rc, $output) = createDSInstance($setup->{inf}, \@errs);
-if ($rc) {
+my @errs = createDSInstance($setup->{inf});
+if (@errs) {
$setup->msg(@errs);
- $setup->msg($FATAL, 'error_creating_dsinstance', $rc, $output);
+ $setup->msg($FATAL, 'error_creating_dsinstance',
+ $setup->{inf}->{slapd}->{ServerIdentifier});
} else {
- $setup->msg('created_dsinstance', $output);
+ $setup->msg('created_dsinstance',
+ $setup->{inf}->{slapd}->{ServerIdentifier});
}
END {
Index: setup-ds.res.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.res.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- setup-ds.res.in 12 Jul 2007 13:52:42 -0000 1.7
+++ setup-ds.res.in 13 Jul 2007 18:35:32 -0000 1.8
@@ -87,8 +87,8 @@
error_creating_suffix = Could not create the suffix '%s'. Error: %s\n\n
setup_exiting = Exiting . . .\nLog file is '%s'\n\n
-error_creating_dsinstance = Error: Could not create directory server instance. Error code %s. Output:\n%s\n
-created_dsinstance = Your new DS instance was successfully created. Output:\n%s\n
+error_creating_dsinstance = Error: Could not create directory server instance '%s'.\n
+created_dsinstance = Your new DS instance '%s' was successfully created.\n
no_mapvalue_for_key = The map value '%s' for key '%s' did not map to a value in any of the given information files.\n
error_opening_ldiftmpl = Could not open the LDIF template file '%s'. Error: %s\n
error_mapping_token_ldiftmpl = The entry '%s' in LDIF file '%s' contains a token '%s' for which there is no mapper.\nPlease check the file and your mapper to make sure all tokens are handled correctly.\n
@@ -96,7 +96,6 @@
error_adding_entry = Error adding entry '%s'. Error: %s\n
error_updating_entry = Error updating entry '%s'. Error: %s\n
-
error_invalid_param = The parameter '%s' has an invalid value '%s'.\n
error_port_available = The port number '%s' is not available for use. This may be due to an\
invalid port number, or the port already being in use by another\
@@ -104,3 +103,19 @@
ServerPort. Error: $!\n
error_invalid_serverid = The ServerIdentifier '%s' contains invalid characters. It must\
contain only alphanumeric characters and the following: #%,.:@_-\n
+error_opening_scripttmpl = Could not open the script template file '%s'. Error: %s\n
+error_creating_directory = Could not create directory '%s'. Error: %s\n
+error_chowning_directory = Could not change ownership of directory '%s' to userid '%s': Error: %s\n
+error_chowning_file = Could not change ownership of '%s' to userid '%s': Error: %s\n
+error_chmoding_file = Could not change permissions of '%s': Error: %s\n
+error_chgrping_directory = Could not change group of directory '%s' to group '%s': Error: %s\n
+error_creating_file = Could not create file '%s'. Error: %s\n
+error_copying_file = Could not copy file '%s' to '%s'. Error: %s\n
+error_enabling_feature = Could not enable the directory server feature '%s'. Error: %s\n
+error_importing_ldif = Could not import LDIF file '%s'. Error: %s. Output: %s\n
+error_starting_server = Could not start the directory server using command '%s'. The last line from the error log was '%s'. Error: %s\n
+error_missing_port_and_ldapi = Either ServerPort or ldapifilepath must be specified. The server must listen to something.\n
+error_missing_port = No ServerPort specified. The server must have a port number to listen to (default 389).\n
+error_server_already_exists = Error: the server already exists at '%s'\
+Please remove it first if you really want to recreate it,\
+or use a different ServerIdentifier to create another instance.\n
From fedora-directory-commits at redhat.com Fri Jul 13 18:35:35 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 13 Jul 2007 14:35:35 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/ldif
template-baseacis.ldif.in, NONE, 1.1 template-country.ldif.in,
NONE, 1.1 template-domain.ldif.in, NONE,
1.1 template-locality.ldif.in, NONE, 1.1 template-org.ldif.in,
NONE, 1.1 template-orgunit.ldif.in, NONE,
1.1 template-state.ldif.in, NONE, 1.1 template-dse.ldif.in,
1.2, 1.3 template.ldif, 1.5, 1.6
Message-ID: <200707131835.l6DIZZAi031249@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31095/ldapserver/ldap/ldif
Modified Files:
template-dse.ldif.in template.ldif
Added Files:
template-baseacis.ldif.in template-country.ldif.in
template-domain.ldif.in template-locality.ldif.in
template-org.ldif.in template-orgunit.ldif.in
template-state.ldif.in
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script
Reviewed by: nhosoi (Thanks!)
Fix Description: The time has come. We can finally get rid of the instance creation C code
once and for all. I've created a DSCreate module that has all of the functionality of the old
create_instance.c code, along with a few items from ldap/admin/lib. The way it works is
this: it first creates the dse.ldif file using template-dse.ldif and the suffix-db template to
create the initial db and suffix. It then adds additional optional configuration depending
on what optional features have been enabled. It creates other config files and copies in
the schema. It then initializes the database. It uses a template file based on the type of
entry implied by the suffix, then adds the default ACIs. If the user chose to do so, it
will also create the ou=people, ou=groups, etc. entries. The user can also supply an LDIF
file which will be used to populate the initial database, in which case none of the default
entries or ACIs will be used. It then starts the server (if desired).
I had to create a function makePaths that works like mkdir -p except that it will chown,
chgrp, and chmod all paths created.
I had to change the other places where instance creation was called to use the new
calling semantics. ds_create changed quite a bit, since it can just use an Inf to pass in the
information instead of calling ds_newinst as a CGI program.
I had to change FileConn to add support for namingContexts (i.e. entries with no parent),
and to have it write each change each time, and to return copies of entries when searching,
to avoid modifying the tree in place. This makes it act much more like LDAP.
I found and fixed a few bugs in Migration along the way that were revealed while integrating
the new DSCreate code.
Platforms tested: RHEL4, FC6
Flag Day: Yes. New instance creation code and autotool changes.
Doc impact: no
--- NEW FILE template-baseacis.ldif.in ---
dn: %ds_suffix%
changetype: modify
add: aci
aci: (targetattr!="userPassword")(version 3.0; acl "Enable anonymous access"; allow (read, search, compare) userdn="ldap:///anyone";)
aci: (targetattr="carLicense || description || displayName || facsimileTelephoneNumber || homePhone || homePostalAddress || initials || jpegPhoto || labeledURL || mail || mobile || pager || photo || postOfficeBox || postalAddress || postalCode || preferredDeliveryMethod || preferredLanguage || registeredAddress || roomNumber || secretary || seeAlso || st || street || telephoneNumber || telexNumber || title || userCertificate || userPassword || userSMIMECertificate || x500UniqueIdentifier")(version 3.0; acl "Enable self write for common attributes"; allow (write) userdn="ldap:///self";)
--- NEW FILE template-country.ldif.in ---
dn: %ds_suffix%
objectclass: top
objectclass: country
c: %naming_value%
--- NEW FILE template-domain.ldif.in ---
dn: %ds_suffix%
objectclass: top
objectclass: domain
dc: %naming_value%
--- NEW FILE template-locality.ldif.in ---
dn: %ds_suffix%
objectclass: top
objectclass: locality
l: %naming_value%
--- NEW FILE template-org.ldif.in ---
dn: %ds_suffix%
objectclass: top
objectclass: organization
o: %naming_value%
--- NEW FILE template-orgunit.ldif.in ---
dn: %ds_suffix%
objectclass: top
objectclass: organizationalUnit
ou: %naming_value%
--- NEW FILE template-state.ldif.in ---
dn: %ds_suffix%
objectclass: top
objectclass: locality
st: %naming_value%
Index: template-dse.ldif.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/ldif/template-dse.ldif.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- template-dse.ldif.in 29 Jun 2007 21:59:13 -0000 1.2
+++ template-dse.ldif.in 13 Jul 2007 18:35:33 -0000 1.3
@@ -9,7 +9,7 @@
nsslapd-certdir: %cert_dir%
nsslapd-ldifdir: %ldif_dir%
nsslapd-bakdir: %bak_dir%
-nsslapd-saslpath: %sasl_path%
+nsslapd-instancedir: %inst_dir%
nsslapd-accesslog-logging-enabled: on
nsslapd-accesslog-maxlogsperdir: 10
nsslapd-accesslog-mode: 600
@@ -22,7 +22,7 @@
nsslapd-accesslog: %log_dir%/access
nsslapd-enquote-sup-oc: off
nsslapd-localhost: %fqdn%
-nsslapd-schemacheck: 1
+nsslapd-schemacheck: on
nsslapd-rewrite-rfc1274: off
nsslapd-return-exact-case: on
nsslapd-ssl-check-hostname: on
@@ -493,7 +493,7 @@
nsslapd-plugininitfunc: orderingRule_init
nsslapd-plugintype: matchingRule
nsslapd-pluginenabled: on
-nsslapd-pluginarg0: @configdir@/slapd-collations.conf
+nsslapd-pluginarg0: %config_dir%/slapd-collations.conf
dn: cn=HTTP Client,cn=plugins,cn=config
objectclass: top
Index: template.ldif
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/ldif/template.ldif,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- template.ldif 18 Apr 2006 17:39:57 -0000 1.5
+++ template.ldif 13 Jul 2007 18:35:33 -0000 1.6
@@ -37,26 +37,24 @@
# All rights reserved.
# END COPYRIGHT BLOCK
#
-dn: %%%SUFFIX%%%
-objectclass: top
-aci: (targetattr ="*")(version 3.0;
- acl "Configuration Administrators Group";allow (all) (groupdn = "ldap:///
- cn=Configuration Administrators, ou=Groups, ou=TopologyManagement, o=NetscapeRoot");)
+dn: %ds_suffix%
+changetype: modify
+add: aci
aci: (targetattr ="*")(version 3.0;
acl "Directory Administrators Group";allow (all) (groupdn = "ldap:///
- cn=Directory Administrators, %%%SUFFIX%%%");)
+ cn=Directory Administrators, %ds_suffix%");)
-dn: cn=Directory Administrators, %%%SUFFIX%%%
+dn: cn=Directory Administrators, %ds_suffix%
objectClass: top
objectClass: groupofuniquenames
cn: Directory Administrators
-dn: ou=Groups, %%%SUFFIX%%%
+dn: ou=Groups, %ds_suffix%
objectclass: top
objectclass: organizationalunit
ou: Groups
-dn: ou=People, %%%SUFFIX%%%
+dn: ou=People, %ds_suffix%
objectclass: top
objectclass: organizationalunit
ou: People
@@ -66,48 +64,48 @@
aci: (targetattr !="cn || sn || uid")(t
argetfilter ="(ou=Accounting)")(version 3.0;acl "Accounting Managers G
roup Permissions";allow (write)(groupdn = "ldap:///cn=Accounting Managers,ou
- =groups,%%%SUFFIX%%%");)
+ =groups,%ds_suffix%");)
aci: (targetattr !="cn || sn || uid")(t
argetfilter ="(ou=Human Resources)")(version 3.0;acl "HR Group Permiss
- ions";allow (write)(groupdn = "ldap:///cn=HR Managers,ou=groups,%%%SUFFIX%%%
+ ions";allow (write)(groupdn = "ldap:///cn=HR Managers,ou=groups,%ds_suffix%
");)
aci: (targetattr !="cn ||sn || uid")(t
argetfilter ="(ou=Product Testing)")(version 3.0;acl "QA Group Permiss
- ions";allow (write)(groupdn = "ldap:///cn=QA Managers,ou=groups,%%%SUFFIX%%%
+ ions";allow (write)(groupdn = "ldap:///cn=QA Managers,ou=groups,%ds_suffix%
");)
aci: (targetattr !="cn || sn || uid")(t
argetfilter ="(ou=Product Development)")(version 3.0;acl "Engineering
Group Permissions";allow (write)(groupdn = "ldap:///cn=PD Managers,ou=groups
- ,%%%SUFFIX%%%");)
+ ,%ds_suffix%");)
-dn: ou=Special Users,%%%SUFFIX%%%
+dn: ou=Special Users,%ds_suffix%
objectclass: top
objectclass: organizationalUnit
ou: Special Users
description: Special Administrative Accounts
-dn: cn=Accounting Managers,ou=groups,%%%SUFFIX%%%
+dn: cn=Accounting Managers,ou=groups,%ds_suffix%
objectclass: top
objectclass: groupOfUniqueNames
cn: Accounting Managers
ou: groups
description: People who can manage accounting entries
-dn: cn=HR Managers,ou=groups,%%%SUFFIX%%%
+dn: cn=HR Managers,ou=groups,%ds_suffix%
objectclass: top
objectclass: groupOfUniqueNames
cn: HR Managers
ou: groups
description: People who can manage HR entries
-dn: cn=QA Managers,ou=groups,%%%SUFFIX%%%
+dn: cn=QA Managers,ou=groups,%ds_suffix%
objectclass: top
objectclass: groupOfUniqueNames
cn: QA Managers
ou: groups
description: People who can manage QA entries
-dn: cn=PD Managers,ou=groups,%%%SUFFIX%%%
+dn: cn=PD Managers,ou=groups,%ds_suffix%
objectclass: top
objectclass: groupOfUniqueNames
cn: PD Managers
From fedora-directory-commits at redhat.com Fri Jul 13 18:35:35 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 13 Jul 2007 14:35:35 -0400
Subject: [Fedora-directory-commits] ldapserver/m4 fhs.m4,1.3,1.4
Message-ID: <200707131835.l6DIZZC9031256@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31095/ldapserver/m4
Modified Files:
fhs.m4
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script
Reviewed by: nhosoi (Thanks!)
Fix Description: The time has come. We can finally get rid of the instance creation C code
once and for all. I've created a DSCreate module that has all of the functionality of the old
create_instance.c code, along with a few items from ldap/admin/lib. The way it works is
this: it first creates the dse.ldif file using template-dse.ldif and the suffix-db template to
create the initial db and suffix. It then adds additional optional configuration depending
on what optional features have been enabled. It creates other config files and copies in
the schema. It then initializes the database. It uses a template file based on the type of
entry implied by the suffix, then adds the default ACIs. If the user chose to do so, it
will also create the ou=people, ou=groups, etc. entries. The user can also supply an LDIF
file which will be used to populate the initial database, in which case none of the default
entries or ACIs will be used. It then starts the server (if desired).
I had to create a function makePaths that works like mkdir -p except that it will chown,
chgrp, and chmod all paths created.
I had to change the other places where instance creation was called to use the new
calling semantics. ds_create changed quite a bit, since it can just use an Inf to pass in the
information instead of calling ds_newinst as a CGI program.
I had to change FileConn to add support for namingContexts (i.e. entries with no parent),
and to have it write each change each time, and to return copies of entries when searching,
to avoid modifying the tree in place. This makes it act much more like LDAP.
I found and fixed a few bugs in Migration along the way that were revealed while integrating
the new DSCreate code.
Platforms tested: RHEL4, FC6
Flag Day: Yes. New instance creation code and autotool changes.
Doc impact: no
Index: fhs.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/fhs.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fhs.m4 26 Apr 2007 02:37:54 -0000 1.3
+++ fhs.m4 13 Jul 2007 18:35:33 -0000 1.4
@@ -39,6 +39,7 @@
[
with_fhs_opt=yes
AC_MSG_RESULT(yes)
+ AC_SUBST(with_fhs_opt)
],
AC_MSG_RESULT(no))
From fedora-directory-commits at redhat.com Fri Jul 13 18:39:17 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 13 Jul 2007 14:39:17 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40
ds_create.in, 1.2, 1.3
Message-ID: <200707131839.l6DIdHWi032730@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32691/adminserver/admserv/cgi-src40
Modified Files:
ds_create.in
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script
Reviewed by: nhosoi (Thanks!)
Fix Description: The time has come. We can finally get rid of the instance creation C code
once and for all. I've created a DSCreate module that has all of the functionality of the old
create_instance.c code, along with a few items from ldap/admin/lib. The way it works is
this: it first creates the dse.ldif file using template-dse.ldif and the suffix-db template to
create the initial db and suffix. It then adds additional optional configuration depending
on what optional features have been enabled. It creates other config files and copies in
the schema. It then initializes the database. It uses a template file based on the type of
entry implied by the suffix, then adds the default ACIs. If the user chose to do so, it
will also create the ou=people, ou=groups, etc. entries. The user can also supply an LDIF
file which will be used to populate the initial database, in which case none of the default
entries or ACIs will be used. It then starts the server (if desired).
I had to create a function makePaths that works like mkdir -p except that it will chown,
chgrp, and chmod all paths created.
I had to change the other places where instance creation was called to use the new
calling semantics. ds_create changed quite a bit, since it can just use an Inf to pass in the
information instead of calling ds_newinst as a CGI program.
I had to change FileConn to add support for namingContexts (i.e. entries with no parent),
and to have it write each change each time, and to return copies of entries when searching,
to avoid modifying the tree in place. This makes it act much more like LDAP.
I found and fixed a few bugs in Migration along the way that were revealed while integrating
the new DSCreate code.
Platforms tested: RHEL4, FC6
Flag Day: Yes. New instance creation code and autotool changes.
Doc impact: no
Index: ds_create.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_create.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ds_create.in 11 Jul 2007 21:36:47 -0000 1.2
+++ ds_create.in 13 Jul 2007 18:39:15 -0000 1.3
@@ -46,6 +46,7 @@
use AdminUtil;
use Util;
use Resource;
+use DSCreate;
my $res = new Resource("@propertydir@/ds_create.res",
"@propertydir@/setup-ds-admin.res",
@@ -57,41 +58,11 @@
# save old start_server param
# set start_server=0
my $start_server = $query->param('start_server');
-$query->param('start_server', '0'); # create server but do not start
-# call ds_newinst as a GET (GET or POST works, GET is simpler)
-$ENV{REQUEST_METHOD} = "GET";
-$ENV{QUERY_STRING} = $query->query_string();
-
-# make sure the child exit code is reset before starting the fake
-# cgi program
-my $prog = "@bindir@/ds_newinst";
-if (! -x $prog) {
- $prog = "@dslibdir@/ds_newinst";
-}
-$? = 0;
-# run the CGI
-my $output = `$prog 2>&1`;
-my $status = $?;
-# check for and report errors
-if ($status) {
- print "Content-type: text/plain\n\n";
- print $output;
- exit $status;
-}
-
-# set up new DS to be managed by config DS - acis, pta config
-
-# new ds info, needed for registration (or get from new dse.ldif)
-# temp = ds_a_get_cgi_var("servport", NULL, NULL);
-# if (!(cf->servid = ds_a_get_cgi_var("servid", "Server Identifier",
-# "Please give your server a short identifier.")))
-# cf->rootdn = dn_normalize_convert(ds_a_get_cgi_var("rootdn", NULL, NULL));
-# if (!(cf->rootpw = ds_a_get_cgi_var("rootpw", NULL, NULL)))
-# cf->start_server = ds_a_get_cgi_var("start_server", NULL, NULL);
-my $inst = $query->param('servid');
-my @errs;
-my $inf = createInfFromConfig("@instconfigdir@/slapd-$inst", $inst, \@errs);
+# create inf from CGI parameters
+my $inf = createInfFromCGIParams($query);
+# create the instance
+my @errs = createDSInstance($inf);
if (@errs) {
print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
@@ -99,6 +70,7 @@
exit 1;
}
+# set up new DS to be managed by config DS - acis, pta config
# add the parmeters necessary to configure this DS to be managed
# by the console and to be registered with the config DS - these
# are usually passed in via the CGI params, or use reasonable
@@ -119,11 +91,11 @@
}
my $servid = $query->param('servid');
-if ($start_server) {
- # ok to use here because not only will ds_newinst have validated that
+if (!defined($start_server) or $start_server) {
+ # ok to use here because not only will createDSInstance have validated that
# servid contains only good characters, but we test for the existence
# of this file first
- $prog = "@dslibdir@/slapd-$servid/start-slapd";
+ my $prog = "@dslibdir@/slapd-$servid/start-slapd";
if (-x $prog) {
$? = 0;
# run the CGI
@@ -144,12 +116,6 @@
}
# register the new server with the configuration ds
-# get config ds url from input or admconf
-# get admin id from input or admconf
-# must get admin password from input (PASSWORD_PIPE?)
-# get admin domain
-# config ds info
-
if (!registerDSWithConfigDS($servid, \@errs, $inf)) {
print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
@@ -161,3 +127,20 @@
print "Content-type: text/plain\n\n";
print "NMC_Status: 0\n";
exit 0;
+
+
+sub createInfFromCGIParams {
+ my $query = shift;
+ my $inf = new Inf;
+ $inf->{General}->{FullMachineName} = $query->param('servname');
+ $inf->{General}->{SuiteSpotUserID} = $query->param('servuser');
+
+ $inf->{slapd}->{ServerPort} = $query->param('servport');
+ $inf->{slapd}->{RootDN} = $query->param('rootdn');
+ $inf->{slapd}->{RootDNPwd} = $query->param('rootpw');
+ $inf->{slapd}->{ServerIdentifier} = $query->param('servid');
+ $inf->{slapd}->{Suffix} = $query->param('suffix');
+ $inf->{slapd}->{start_server} = 0; # we will start it explicitly later
+
+ return $inf;
+}
From fedora-directory-commits at redhat.com Fri Jul 13 18:39:17 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 13 Jul 2007 14:39:17 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
AdminServer.pm.in, 1.5, 1.6 AdminUtil.pm.in, 1.9,
1.10 migrate-ds-admin.pl.in, 1.3, 1.4 setup-ds-admin.pl.in,
1.7, 1.8 setup-ds-admin.res.in, 1.4, 1.5
Message-ID: <200707131839.l6DIdHqq032737@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32691/adminserver/admserv/newinst/src
Modified Files:
AdminServer.pm.in AdminUtil.pm.in migrate-ds-admin.pl.in
setup-ds-admin.pl.in setup-ds-admin.res.in
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script
Reviewed by: nhosoi (Thanks!)
Fix Description: The time has come. We can finally get rid of the instance creation C code
once and for all. I've created a DSCreate module that has all of the functionality of the old
create_instance.c code, along with a few items from ldap/admin/lib. The way it works is
this: it first creates the dse.ldif file using template-dse.ldif and the suffix-db template to
create the initial db and suffix. It then adds additional optional configuration depending
on what optional features have been enabled. It creates other config files and copies in
the schema. It then initializes the database. It uses a template file based on the type of
entry implied by the suffix, then adds the default ACIs. If the user chose to do so, it
will also create the ou=people, ou=groups, etc. entries. The user can also supply an LDIF
file which will be used to populate the initial database, in which case none of the default
entries or ACIs will be used. It then starts the server (if desired).
I had to create a function makePaths that works like mkdir -p except that it will chown,
chgrp, and chmod all paths created.
I had to change the other places where instance creation was called to use the new
calling semantics. ds_create changed quite a bit, since it can just use an Inf to pass in the
information instead of calling ds_newinst as a CGI program.
I had to change FileConn to add support for namingContexts (i.e. entries with no parent),
and to have it write each change each time, and to return copies of entries when searching,
to avoid modifying the tree in place. This makes it act much more like LDAP.
I found and fixed a few bugs in Migration along the way that were revealed while integrating
the new DSCreate code.
Platforms tested: RHEL4, FC6
Flag Day: Yes. New instance creation code and autotool changes.
Doc impact: no
Index: AdminServer.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminServer.pm.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AdminServer.pm.in 4 Jul 2007 01:31:33 -0000 1.5
+++ AdminServer.pm.in 13 Jul 2007 18:39:15 -0000 1.6
@@ -126,18 +126,20 @@
$setup->msg('create_adminserver_filesdirs');
# these paths are owned exclusively by admin sever
+ my @errs;
for ($configdir, $securitydir, $logdir) {
- $! = 0; # clear errno
- if (! -d $_) {
- mkpath($_, 1, 0700);
- } else {
- chmod 0700, $_;
- }
- if (! -d $_) {
- $setup->msg($FATAL, 'error_creating_directory', $_, $!);
+ @errs = makePaths($_, 0700, $setup->{inf}->{admin}->{SysUser},
+ $setup->{inf}->{General}->{SuiteSpotGroup});
+ if (@errs) {
+ $setup->msg($FATAL, @errs);
return 0;
}
$! = 0; # clear errno
+ chmod 0700, $_;
+ if ($!) {
+ $setup->msg($FATAL, 'error_chmoding_directory', $_, $!);
+ return 0;
+ }
chown $uid, -1, $_;
if ($!) {
$setup->msg($FATAL, 'error_chowning_directory', $_,
@@ -147,17 +149,18 @@
}
# these paths are shared by SuiteSpotGroup members
- $! = 0; # clear errno
- if (! -d $rundir) {
- mkpath($rundir, 0, 0770);
- } else {
- chmod 0770, $rundir;
- }
- if (! -d $rundir) {
- $setup->msg($FATAL, 'error_creating_directory', $rundir, $!);
+ @errs = makePaths($rundir, 0770, $setup->{inf}->{admin}->{SysUser},
+ $setup->{inf}->{General}->{SuiteSpotGroup});
+ if (@errs) {
+ $setup->msg($FATAL, @errs);
return 0;
}
$! = 0; # clear errno
+ chmod 0770, $rundir;
+ if ($!) {
+ $setup->msg($FATAL, 'error_chmoding_directory', $rundir, $!);
+ return 0;
+ }
chown -1, $gid, $rundir;
if ($!) {
$setup->msg($FATAL, 'error_chgrping_directory', $rundir,
@@ -327,12 +330,16 @@
$cmd .= " configuration.nsServerAddress=\"$serverAddress\"";
}
- if (system($cmd)) {
+ $? = 0; # clear error
+ my $output = `$cmd 2>&1`;
+ if ($?) {
+ debug(0, $output);
$ENV{LD_LIBRARY_PATH} = $savepath;
$ENV{SHLIB_PATH} = $savepath;
return 0;
}
+ debug(1, $output);
$ENV{LD_LIBRARY_PATH} = $savepath;
$ENV{SHLIB_PATH} = $savepath;
return 1;
@@ -453,3 +460,12 @@
my $setup = shift;
return createAdminServer($setup, 1);
}
+
+1;
+
+# emacs settings
+# Local Variables:
+# mode:perl
+# indent-tabs-mode: nil
+# tab-width: 4
+# End:
Index: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AdminUtil.pm.in 11 Jul 2007 01:20:21 -0000 1.9
+++ AdminUtil.pm.in 13 Jul 2007 18:39:15 -0000 1.10
@@ -745,3 +745,12 @@
return @{$errs} ? 0 : 1;
}
+
+1;
+
+# emacs settings
+# Local Variables:
+# mode:perl
+# indent-tabs-mode: nil
+# tab-width: 4
+# End:
Index: migrate-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/migrate-ds-admin.pl.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- migrate-ds-admin.pl.in 12 Jul 2007 14:00:10 -0000 1.3
+++ migrate-ds-admin.pl.in 13 Jul 2007 18:39:15 -0000 1.4
@@ -82,7 +82,9 @@
# next, migrate the admin server - this also registers the directory servers
$mig->msg('begin_as_migration', $mig->{oldsroot});
-migrateAdminServer($mig);
+if (!migrateAdminServer($mig)) {
+ exit 1;
+}
# next, register/update the new directory servers
# in the config ds
Index: setup-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- setup-ds-admin.pl.in 4 Jul 2007 01:31:33 -0000 1.7
+++ setup-ds-admin.pl.in 13 Jul 2007 18:39:15 -0000 1.8
@@ -46,6 +46,7 @@
use Inf;
use Resource;
use DialogManager;
+use DSCreate;
use AdminUtil;
use AdminServer;
use Util;
@@ -145,16 +146,13 @@
$setup->msg('create_dirserver');
# create a directory server instance
-my @errs = ();
-my ($rc, $output) = createDSInstance($setup->{inf}, \@errs);
-if ($rc) {
- if (@errs) {
- $setup->msg(@errs);
- }
- $setup->msg($FATAL, 'error_creating_dsinstance', $rc, $output);
+my @errs = createDSInstance($setup->{inf});
+if (@errs) {
+ $setup->msg(@errs);
+ $setup->msg($FATAL, 'error_creating_dsinstance', $setup->{inf}->{slapd}->{ServerIdentifier});
exit 1;
} else {
- $setup->msg('created_dsinstance', $output);
+ $setup->msg('created_dsinstance', $setup->{inf}->{slapd}->{ServerIdentifier});
}
# setup directory server instance to be the configuration DS
Index: setup-ds-admin.res.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.res.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- setup-ds-admin.res.in 20 Jun 2007 16:35:02 -0000 1.4
+++ setup-ds-admin.res.in 13 Jul 2007 18:39:15 -0000 1.5
@@ -92,11 +92,6 @@
error_create_dirserver = Failed to create directory server instance\n
error_create_configds = Failed to create the configuration directory server\n
error_create_adminserver = Failed to create and configure the admin server\n
-error_creating_directory = Could not create admin server directory '%s'. Error: %s\n
-error_chowning_directory = Could not change ownership of directory '%s' to userid '%s': Error: %s\n
-error_chowning_file = Could not change ownership of file '%s' to userid '%s': Error: %s\n
-error_chmoding_file = Could not change permissions of file '%s': Error: %s\n
-error_chgrping_directory = Could not change group of directory '%s' to group '%s': Error: %s\n
updating_admconf = Updating adm.conf . . .\n
error_updating_admconf = Could not update adm.conf. Error: %s\n
updating_admpw = Updating admpw . . .\n
From fedora-directory-commits at redhat.com Fri Jul 13 19:47:17 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 13 Jul 2007 15:47:17 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40 config.c,
1.12, 1.13
Message-ID: <200707131947.l6DJlHMm015368@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15349/adminserver/admserv/cgi-src40
Modified Files:
config.c
Log Message:
Resolves: bug 248184
Bug Description: adminserver: The config CGI program does not preserve Listen IP addr
Reviewed by: ???
Fix Description: Move the existing code into a new function. This function will set the Listen directive IP and port, preserving any existing values.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
Index: config.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/config.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config.c 6 Jul 2007 18:06:19 -0000 1.12
+++ config.c 13 Jul 2007 19:47:15 -0000 1.13
@@ -99,6 +99,43 @@
static int change_server_uid(PsetHndl pset, char* newuname);
#endif
+static int
+update_port_addr(char *port, char *addr)
+{
+ char line[BIG_LINE];
+ char *val = read_conf("console.conf", "Listen");
+ char *ptr = NULL;
+ int err;
+
+ if (val) {
+ ptr = strchr(val, ':');
+ }
+
+ if (ptr) {
+ *ptr = '\0';
+ ++ptr; /* ptr points to the start of the port number in host:port */
+ } else if (val) {
+ ptr = val; /* Listen only specifies the port number */
+ val = "0.0.0.0"; /* default listen on all interfaces */
+ } else {
+ /* console.conf should always have Listen with the server port */
+ ptr = "80"; /* default httpd port? */
+ val = "0.0.0.0";
+ }
+ /*
+ If ip address is not defined, it means that server should
+ listen on all interfaces. This is dependant upon console
+ to always include the port string first.
+ */
+ PR_snprintf(line, sizeof(line), "%s:%s",
+ (addr && *addr) ? addr : val,
+ (port && *port) ? port : ptr);
+ err = update_conf("console.conf", "Listen", line);
+ PL_strfree(val);
+
+ return err;
+}
+
int main(int argc, char *argv[])
{
int _ai = ADMUTIL_Init();
@@ -451,7 +488,7 @@
}
if(err == 0) {
- err = update_conf("console.conf", "Listen", valptr);
+ err = update_port_addr(valptr, NULL); /* update port only */
}
if (err < 0)
@@ -495,34 +532,7 @@
rpt_err(APP_ERROR, error_info, NULL, NULL);
}
else {
- char line[BIG_LINE];
- char *val = read_conf("console.conf", "Listen");
- char *ptr = NULL;
-
- if (val) {
- ptr = strchr(val, ':');
- }
-
- if (ptr) {
- ++ptr; /* ptr points to the start of the port number in host:port */
- } else if (val) {
- ptr = val; /* Listen only specifies the port number */
- } else {
- /* console.conf should always have Listen with the server port */
- ptr = "80"; /* default httpd port? */
- }
- /*
- If ip address is not defined, it means that server should
- listen on all interfaces. This is dependant upon console
- to always include the port string first.
- */
- if (valptr && valptr[0] ) {
- PR_snprintf(line, sizeof(line), "%s:%s", valptr, ptr);
- } else {
- PR_snprintf(line, sizeof(line), "0.0.0.0:%s", ptr);
- }
- err = update_conf("console.conf", "Listen", line);
- PL_strfree(val);
+ err = update_port_addr(NULL, valptr); /* update address only */
}
}
From fedora-directory-commits at redhat.com Fri Jul 13 19:51:50 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 13 Jul 2007 15:51:50 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
DSCreate.pm.in, 1.1, 1.2 Inf.pm, 1.3, 1.4 SetupDialogs.pm.in,
1.1, 1.2 Util.pm.in, 1.8, 1.9
Message-ID: <200707131951.l6DJpoe7015756@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15733/ldapserver/ldap/admin/src/scripts
Modified Files:
DSCreate.pm.in Inf.pm SetupDialogs.pm.in Util.pm.in
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script
Reviewed by: nhosoi (Thanks!)
Fix Description: 1) Inf needs to be able to read the .inf file from stdin. This is what ds_newinst.pl does currently.
2) getlogin seems not to work in all cases, so add a more robust replacement.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
Index: DSCreate.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DSCreate.pm.in 13 Jul 2007 18:35:32 -0000 1.1
+++ DSCreate.pm.in 13 Jul 2007 19:51:48 -0000 1.2
@@ -596,7 +596,7 @@
if (!$inf->{General}->{SuiteSpotUserID}) {
if ($> != 0) { # if not root, use the user's uid
- $inf->{General}->{SuiteSpotUserID} = getlogin;
+ $inf->{General}->{SuiteSpotUserID} = getLogin;
}
# otherwise, the uid must be specified
}
Index: Inf.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Inf.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Inf.pm 20 Jun 2007 14:40:24 -0000 1.3
+++ Inf.pm 13 Jul 2007 19:51:48 -0000 1.4
@@ -77,8 +77,14 @@
my $incontinuation = 0;
my $curkey;
- open INF, $filename or die "Error: could not open inf file $filename: $!";
- while () {
+ my $inffh;
+ if ($filename eq "-") {
+ $inffh = \*STDIN;
+ } else {
+ open INF, $filename or die "Error: could not open inf file $filename: $!";
+ $inffh = \*INF;
+ }
+ while (<$inffh>) {
my $iscontinuation;
chop; # trim trailing newline
if (/^\s*$/) { # skip blank/empty lines
@@ -107,7 +113,9 @@
$incontinuation = 0;
}
}
- close INF;
+ if ($inffh ne \*STDIN) {
+ close $inffh;
+ }
}
sub section {
@@ -149,6 +157,8 @@
$filename = $self->{filename};
}
+ return if ($filename eq "-");
+
open INF, ">$filename" or die "Error: could not write inf file $filename: $!";
# write General section first
$self->writeSection('General', \*INF);
Index: SetupDialogs.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/SetupDialogs.pm.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetupDialogs.pm.in 19 Jun 2007 18:24:57 -0000 1.1
+++ SetupDialogs.pm.in 13 Jul 2007 19:51:48 -0000 1.2
@@ -44,6 +44,7 @@
use Setup;
use Dialog;
use Net::Domain qw(hostfqdn);
+use Util;
my $welcome = new DialogYesNo (
$EXPRESS,
@@ -136,7 +137,7 @@
}
}
if ($> != 0) { # if not root, the user must be our uid
- my $username = getlogin;
+ my $username = getLogin;
if ($strans ne $username) {
$self->{manager}->alert("dialog_ssuser_must_be_same", $username);
return $DialogManager::SAME;
@@ -218,7 +219,7 @@
if ($> == 0) { # if root, use the default user
$username = "@defaultuser@";
} else { # if not root, use the user's uid
- $username = getlogin;
+ $username = getLogin;
}
}
return $username;
Index: Util.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Util.pm.in 13 Jul 2007 18:35:32 -0000 1.8
+++ Util.pm.in 13 Jul 2007 19:51:48 -0000 1.9
@@ -48,11 +48,11 @@
@EXPORT = qw(portAvailable getAvailablePort isValidDN addSuffix getMappedEntries
process_maptbl check_and_add_entry getMappedEntries
getHashedPassword debug createInfFromConfig
- isValidServerID isValidUser makePaths);
+ isValidServerID isValidUser makePaths getLogin);
@EXPORT_OK = qw(portAvailable getAvailablePort isValidDN addSuffix getMappedEntries
process_maptbl check_and_add_entry getMappedEntries
getHashedPassword debug createInfFromConfig
- isValidServerID isValidUser makePaths);
+ isValidServerID isValidUser makePaths getLogin);
use strict;
@@ -111,6 +111,10 @@
return $servid =~ /^[$validchars]+$/o;
}
+sub getLogin {
+ return getlogin || (getpwuid($>))[0] || $ENV{USER} || die "Error: could not determine the current user ID: $!";
+}
+
sub isValidUser {
my $user = shift;
# convert numeric uid to string
@@ -122,7 +126,7 @@
}
}
if ($> != 0) { # if not root, the user must be our uid
- my $username = getlogin;
+ my $username = getLogin;
if ($strans ne $username) {
return ("dialog_ssuser_must_be_same", $username);
}
@@ -799,8 +803,8 @@
print $outfh "start_server= 0\n";
my $suffix;
- my $ent = $conn->search("cn=ldbm database,cn=plugins,cn=config",
- "one", "(objectclass=*)");
+ $ent = $conn->search("cn=ldbm database,cn=plugins,cn=config",
+ "one", "(objectclass=*)");
if (!$ent) {
push @{$errs}, "error_opening_dseldif", $fname, $!;
close $outfh;
From fedora-directory-commits at redhat.com Fri Jul 13 19:53:19 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 13 Jul 2007 15:53:19 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
ASDialogs.pm.in, 1.4, 1.5
Message-ID: <200707131953.l6DJrJMs015820@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15803/adminserver/admserv/newinst/src
Modified Files:
ASDialogs.pm.in
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script
Reviewed by: nhosoi (Thanks!)
Fix Description: 1) Inf needs to be able to read the .inf file from stdin. This is what ds_newinst.pl does currently.
2) getlogin seems not to work in all cases, so add a more robust replacement.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
Index: ASDialogs.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ASDialogs.pm.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ASDialogs.pm.in 20 Jun 2007 16:35:02 -0000 1.4
+++ ASDialogs.pm.in 13 Jul 2007 19:53:17 -0000 1.5
@@ -138,7 +138,7 @@
}
}
if ($> != 0) { # if not root, the user must be our uid
- my $username = getlogin;
+ my $username = getLogin;
if ($strans ne $username) {
$self->{manager}->alert("dialog_assysuser_must_be_same", $username);
return $DialogManager::SAME;
@@ -170,7 +170,7 @@
if ($> == 0) { # if root, use the default user
$user = "@httpduser@";
} else { # if not root, use the user's uid
- $user = getlogin;
+ $user = getLogin;
}
}
return $user;
From fedora-directory-commits at redhat.com Mon Jul 16 16:49:43 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 16 Jul 2007 12:49:43 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd/tools/rsearch/scripts
dbgen.pl.in, NONE, 1.1 dbgen.pl, 1.2, NONE
Message-ID: <200707161649.l6GGnhvp017881@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17673
Added Files:
dbgen.pl.in
Removed Files:
dbgen.pl
Log Message:
Resolves: bug 248272
Description: CLU: dbgen.pl fails to load data files
Reviewed by: nhosoi (Thanks!)
Fix Description: dbgen.pl is hardcoded to look for data files in ../data. Instead, we should allow the user to provide the location to the data files e.g. -l /path/to/data, and we should also use share/brand-ds/data as the default directory.
--- NEW FILE dbgen.pl.in ---
#!/usr/bin/perl
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#------------------------------------------------------------------------
## NAME
## dbgen
##
## DESCRIPTION
## Random LDIF database creator, specially modified from DirectoryMark
## Original weibe done by David Boreham in C++.
##
## Fixed random seed generator for uniqueness
## Updated function MakeRandomName:
## Changed default RDN type to UID and
## added -c option to enable CN type naming
## Added personal_title and generationQualifier data
## Added function to create randon SSN's if needed
## Updated generation output to show total entries created regardless of -v option
## Changed userPassword to be the same as UID.
## Now, dc style namingcontext can be used.
#------------------------------------------------------------------------
sub PrintUsage {
print STDERR
"Usage: $0 [options] -o output_file -n number\n",
"\t Where options are:\n",
"\t -s suffix, default is 'dc=example,dc=com'\n",
"\t -c for CN naming style RDN's : default is UID\n",
"\t -O for organizationalPersons, default is inetOrgPerson\n",
"\t -p for piranha style aci's, default is barracuda\n",
"\t -r seed---seed number for random number generator\n",
"\t -g print extra entries for orgchart\n",
"\t -x suppress printing pre amble\n",
"\t -y suppress printing organizational units\n",
"\t -l location of directory containing data files, default is @templatedir@\n",
"\t -v verbose\n",
"\t -q quiet\n",
"\n";
exit;
}
&PrintUsage if ($#ARGV == -1);
@EmployeeTypes = ("Manager", "Normal", "Peon");
@personal_title = ("Mr",
"Mrs",
"Miss",
"Senior",
"Junior",
"III",
"Cool");
@generationQ = ("I",
"II",
"III",
"IV",
"V",
"VI",
"VII");
@title_ranks = ("Senior",
"Master",
"Associate",
"Junior",
"Chief",
"Supreme",
"Elite");
@positions =("Accountant",
"Admin",
"Architect",
"Assistant",
"Artist",
"Consultant",
"Czar",
"Dictator",
"Director",
"Diva",
"Dreamer",
"Evangelist",
"Engineer",
"Figurehead",
"Fellow",
"Grunt",
"Guru",
"Janitor",
"Madonna",
"Manager",
"Pinhead",
"President",
"Punk",
"Sales Rep",
"Stooge",
"Visionary",
"Vice President",
"Writer",
"Warrior",
"Yahoo");
@localities = ("Mountain View", "Redmond", "Redwood Shores", "Armonk",
"Cambridge", "Santa Clara", "Sunnyvale", "Alameda",
"Cupertino", "Menlo Park", "Palo Alto", "Orem",
"San Jose", "San Francisco", "Milpitas", "Hartford", "Windsor",
"Boston", "New York", "Detroit", "Dallas", "Denver");
@area_codes = ("303", "415", "408", "510", "804", "818",
"213", "206", "714");
my $mycert =
"usercertificate;binary:: MIIBvjCCASegAwIBAgIBAjANBgkqhkiG9w0BAQQFADAnMQ8wDQYD\n VQQDEwZjb25maWcxFDASBgNVBAMTC01NUiBDQSBDZXJ0MB4XDTAxMDQwNTE1NTEwNloXDTExMDcw\n NTE1NTEwNlowIzELMAkGA1UEChMCZnIxFDASBgNVBAMTC01NUiBTMSBDZXJ0MIGfMA0GCSqGSIb3\n DQEBAQUAA4GNADCBiQKBgQDNlmsKEaPD+o3mAUwmW4E40MPs7aiui1YhorST3KzVngMqe5PbObUH\n MeJN7CLbq9SjXvdB3y2AoVl/s5UkgGz8krmJ8ELfUCU95AQls321RwBdLRjioiQ3MGJiFjxwYRIV\n j1CUTuX1y8dC7BWvZ1/EB0yv0QDtp2oVMUeoK9/9sQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBADev\n hxY6QyDMK3Mnr7vLGe/HWEZCObF+qEo2zWScGH0Q+dAmhkCCkNeHJoqGN4NWjTdnBcGaAr5Y85k1\n o/vOAMBsZePbYx4SrywL0b/OkOmQX+mQwieC2IQzvaBRyaNMh309vrF4w5kExReKfjR/gXpHiWQz\n GSxC5LeQG4k3IP34\n";
%ceo =
(
"uid" => "ceo",
"givenname" => "John",
"sn" => "Budd",
"title" => "CEO",
"cn" => "",
"dn" => ""
);
%ep0 =
(
"uid" => "exec_president0",
"givenname" => "Paul",
"sn" => "Grant",
"title" => "Exective President",
"cn" => "",
"dn" => ""
);
%ep1 =
(
"uid" => "exec_president1",
"givenname" => "Jill",
"sn" => "Peterson",
"title" => "Exective President",
"cn" => "",
"dn" => ""
);
@exective_presidents = (\%ep0, \%ep1);
%p0 =
(
"uid" => "president0",
"givenname" => "Pete",
"sn" => "Dunne",
"title" => "President",
"cn" => "",
"dn" => ""
);
%p1 =
(
"uid" => "president1",
"givenname" => "Jannet",
"sn" => "Keys",
"title" => "President",
"cn" => "",
"dn" => ""
);
%p2 =
(
"uid" => "president2",
"givenname" => "Kathy",
"sn" => "Yang",
"title" => "President",
"cn" => "",
"dn" => ""
);
%p3 =
(
"uid" => "president3",
"givenname" => "Anne",
"sn" => "Meissner",
"title" => "President",
"cn" => "",
"dn" => ""
);
@presidents = (\%p0, \%p1, \%p2, \%p3);
%vp0 =
(
"uid" => "vice_president0",
"givenname" => "Jack",
"sn" => "Cho",
"title" => "Vice President",
"cn" => "",
"dn" => ""
);
%vp1 =
(
"uid" => "vice_president1",
"givenname" => "Diane",
"sn" => "Smith",
"title" => "Vice President",
"cn" => "",
"dn" => ""
);
%vp2 =
(
"uid" => "vice_president2",
"givenname" => "Alex",
"sn" => "Merrells",
"title" => "Vice President",
"cn" => "",
"dn" => ""
);
%vp3 =
(
"uid" => "vice_president3",
"givenname" => "Yumi",
"sn" => "Mehta",
"title" => "Vice President",
"cn" => "",
"dn" => ""
);
%vp4 =
(
"uid" => "vice_president4",
"givenname" => "Michael",
"sn" => "Natkovich",
"title" => "Vice President",
"cn" => "",
"dn" => ""
);
%vp5 =
(
"uid" => "vice_president5",
"givenname" => "Keith",
"sn" => "Lucus",
"title" => "Vice President",
"cn" => "",
"dn" => ""
);
@vice_presidents = (\%vp0, \%vp1, \%vp2, \%vp3, \%vp4, \%vp5);
%d0 =
(
"uid" => "director0",
"givenname" => "Chris",
"sn" => "Harrison",
"title" => "Director",
"cn" => "",
"dn" => ""
),
%d1 =
(
"uid" => "director1",
"givenname" => "Jane",
"sn" => "Baker",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d2 =
(
"uid" => "director2",
"givenname" => "Ed",
"sn" => "Becket",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d3 =
(
"uid" => "director3",
"givenname" => "Will",
"sn" => "Stevenson",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d4 =
(
"uid" => "director4",
"givenname" => "Kieran",
"sn" => "Beckham",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d5 =
(
"uid" => "director5",
"givenname" => "Greg",
"sn" => "Emerson",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d6 =
(
"uid" => "director6",
"givenname" => "Ian",
"sn" => "Parker",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d7 =
(
"uid" => "director7",
"givenname" => "Liem",
"sn" => "Olson",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d8 =
(
"uid" => "director8",
"givenname" => "George",
"sn" => "Cruise",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d9 =
(
"uid" => "director9",
"givenname" => "Yoshiko",
"sn" => "Tucker",
"title" => "Director",
"cn" => "",
"dn" => ""
);
@directors = (\%d0, \%d1, \%d2, \%d3, \%d4, \%d5, \%d6, \%d7, \%d8, \%d9);
%m0 =
(
"uid" => "manager0",
"givenname" => "Teresa",
"sn" => "Chan",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m1 =
(
"uid" => "manager1",
"givenname" => "Tom",
"sn" => "Anderson",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m2 =
(
"uid" => "manager2",
"givenname" => "Olga",
"sn" => "Young",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m3 =
(
"uid" => "manager3",
"givenname" => "Bill",
"sn" => "Graham",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m4 =
(
"uid" => "manager4",
"givenname" => "Todd",
"sn" => "Hoover",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m5 =
(
"uid" => "manager5",
"givenname" => "Ken",
"sn" => "Hamilton",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m6 =
(
"uid" => "manager6",
"givenname" => "Christine",
"sn" => "Jobs",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m7 =
(
"uid" => "manager7",
"givenname" => "Joanna",
"sn" => "Lake",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m8 =
(
"uid" => "manager8",
"givenname" => "Kim",
"sn" => "Remley",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m9 =
(
"uid" => "manager9",
"givenname" => "Nick",
"sn" => "Pennebaker",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m10 =
(
"uid" => "manager10",
"givenname" => "Ted",
"sn" => "Hardy",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m11 =
(
"uid" => "manager11",
"givenname" => "Tanya",
"sn" => "Nielsen",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m12 =
(
"uid" => "manager12",
"givenname" => "Sam",
"sn" => "Madams",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m13 =
(
"uid" => "manager13",
"givenname" => "Judy",
"sn" => "Stewart",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m14 =
(
"uid" => "manager14",
"givenname" => "Martha",
"sn" => "Kidman",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m15 =
(
"uid" => "manager15",
"givenname" => "Leo",
"sn" => "Knuth",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m16 =
(
"uid" => "manager16",
"givenname" => "Cecil",
"sn" => "Guibas",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m17 =
(
"uid" => "manager17",
"givenname" => "Jay",
"sn" => "Hows",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
@managers = (\%m0, \%m1, \%m2, \%m3, \%m4, \%m5, \%m6, \%m7, \%m8, \%m9, \%m10, \%m11, \%m12, \%m13, \%m14, \%m15, \%m16, \%m17);
require "flush.pl";
require "getopts.pl";
&Getopts('n:o:s:r:cOvpqgxyl:');
$Number_To_Generate = $opt_n;
$Verbose = $opt_v;
$Quiet = $opt_q;
$Output_File_Name = $opt_o;
$Random_Seed = $opt_r || 0xdbdbdbdb;
$TargetServer = $opt_t;
$debug = $opt_d;
$Suffix = $opt_s || 'dc=example,dc=com';
$NamingType = "cn" if ($opt_c);
$NamingType = "uid" if (!$opt_c);
$inetOrgPerson = "objectClass: inetOrgPerson\n" if (!$opt_O);
$PrintOrgChartDat = $opt_g;
$DataDir = $opt_l || "@templatedir@";
$printpreamble = 1;
if ("" != $opt_x)
{
$printpreamble = 0;
}
$printorgunit = 1;
if ("" != $opt_y)
{
$printorgunit = 0;
}
if ($Suffix =~ /o=/) {
($Organization) = $Suffix =~ /o=([^,]+)/;
$objectvalue = "organization";
$line = "o: $Organization";
if ($Organization =~ /\s+/) {
($Organization) = $Organization =~ /([^\s]+)/;
$Organization .= ".com";
} elsif ($Organization !~ /\.com|\.net|\.org/) {
$Organization .= ".com";
}
} elsif ($Suffix =~ /dc=/) {
$Organization = $Suffix;
$Organization =~ s/,\s*dc=/./g;
($domain) = $Organization =~ /dc=([^\.]+)/;
$Organization =~ s/dc=//;
$objectvalue = "domain";
$line = "dc: $domain";
}
# Print help message if user doesn't know how many entries to make
# or no output file specified
if ( (!$Number_To_Generate) || (!$Output_File_Name)) {
&PrintUsage;
}
srand($Random_Seed);
print "Loading Name Data...\n" if $Verbose;
$GivenNamesFile = "$DataDir/dbgen-GivenNames";
$FamilyNamesFile = "$DataDir/dbgen-FamilyNames";
$OrgUnitsFile = "$DataDir/dbgen-OrgUnits";
&ReadGivenNames;
&ReadFamilyNames;
&ReadOrgUnits;
print "Done\n" if $Verbose;
if ($printpreamble)
{
if ($piranha) {
&PrintPreAmblePiranha($Output_File_Name);
}
else {
&PrintPreAmbleBarracuda($Output_File_Name);
}
}
open (OUTPUT_FILE, ">>$Output_File_Name") ||
die "Error---Can't open output file $Output_File_Name\n";
if ($printorgunit)
{
&PrintOrganizationalUnits;
}
if ($PrintOrgChartDat)
{
# CEO
&PrintManagers(\%ceo, "", $ceo{"dn"});
for (my $j = 0; $j < @exective_presidents; $j++)
{
&PrintManagers($exective_presidents[$j], &MakeRandomOrgUnit, $ceo{"dn"});
}
# Presidents
for (my $j = 0; $j < @presidents; $j++)
{
my $who = int rand @exective_presidents;
&PrintManagers($presidents[$j],
&MakeRandomOrgUnit, $exective_presidents[$who]{"dn"});
}
# Vice Presidents
for (my $j = 0; $j < @vice_presidents; $j++)
{
my $who = int rand @presidents;
&PrintManagers($vice_presidents[$j],
&MakeRandomOrgUnit, $presidents[$who]{"dn"});
}
# Directors
for (my $j = 0; $j < @directors; $j++)
{
my $who = int rand @vice_presidents;
&PrintManagers($directors[$j],
&MakeRandomOrgUnit, $vice_presidents[$who]{"dn"});
}
# Managers
for (my $j = 0; $j < @managers; $j++)
{
my $who = int rand @directors;
&PrintManagers($managers[$j],
&MakeRandomOrgUnit, $directors[$who]{"dn"});
}
}
print "Generating $Number_To_Generate entries, please wait\n";
print "Progress: ";
# We don't want people with duplicate names, so for each name generated,
# add it to "TheMap", which is an associative array with the
# name as the key. If there's a duplicate, throw the name out and
# try again.
$dups = 0;
# Generate Number_To_Generate distinct entries. If a duplicate
# is created, toss it out and try again.
# CHANGED: updated to allow for uid naming style or cn style. Check the RDN for uniqueness
for ($x= 0; $x < $Number_To_Generate; $x++) {
($givenName, $sn, $cn, $uid, $rdn,) = &MakeRandomName;
if (&AddAndCheck($rdn)) {
print "Duplicate: $rdn...\n" if $debug;
&flush(STDOUT);
$dups++;
$x--;
next;
}
$OrgUnit = &MakeRandomOrgUnit;
$facsimileTelephoneNumber = &MakeRandomTelephone;
$postalAddress = &MakeRandomPostalAddress (
int rand 1000,
int rand 1000,
$OrgUnit);
$postOfficeBox = int rand 10000;
$telephoneNumber = &MakeRandomTelephone;
$title = &MakeRandomTitle($OrgUnit);
# $userPassword = reverse ($cn);
# $userPassword =~ s/\s//g;
# $userPassword = substr($userPassword, 0, 10);
$locality = &MakeRandomLocality;
# $desc = "[0] This is $cn" . "'s description.";
$fourdigit = int rand 10000;
$desc = "2;$fourdigit;CN=Red Hat CS 71GA Demo,O=Red Hat CS 71GA Demo,C=US;CN=RHCS Agent - admin01,UID=admin01,O=redhat,C=US";
my $z = 1;
# for (; $z < 1024; $z++)
for (; $z < 2; $z++)
{
$desc = $desc . " [$z] This is $cn" . "'s description.";
}
$description = $desc;
$mail = &MakeMailAddress($givenName, $sn, $Organization);
if ($inetOrgPerson) {
$carLicense = "carLicense: " . &MakeRandomCarLicense . "\n";
$departmentNumber = "departmentNumber: " . (int rand 10000) . "\n";
$employeeType = "employeeType: " . &MakeRandomEmployeeType . "\n";
$homePhone = "homePhone: " . &MakeRandomTelephone . "\n";
$initials = "initials: " . &MakeInitials ($givenName, $sn) . "\n";
$mobile = "mobile: " . &MakeRandomTelephone . "\n";
$pager = "pager: " . &MakeRandomTelephone . "\n";
if ($PrintOrgChartDat) {
$managerCn = $managers[int rand @managers]{"dn"};
} else {
$managerCn = $managers[int rand @managers]{"givenname"} . " " .
$managers[int rand @managers]{"sn"};
}
($junk, $junk, $secretary_cn) = &MakeRandomName;
$manager = "manager: $managerCn " . "\n";
$secretary = "secretary: $secretary_cn" . "\n";
$roomNumber = "roomNumber: " . (int rand 10000) . "\n";
$userPassword = "$uid\n";
}
if ($PrintOrgChartDat) {
$dnstr = "dn: $NamingType=$rdn, ou=People, $Suffix\n",
} else {
$dnstr = "dn: $NamingType=$rdn, ou=$OrgUnit, $Suffix\n";
}
print OUTPUT_FILE
$dnstr,
"objectClass: top\n",
"objectClass: person\n",
"objectClass: organizationalPerson\n",
$inetOrgPerson,
"cn: $cn\n",
"sn: $sn\n",
"uid: $uid\n",
"givenName: $givenName\n",
"description: $description\n",
"userPassword: $userPassword",
$departmentNumber,
$employeeType,
$homePhone,
$initials,
"telephoneNumber: $telephoneNumber\n",
"facsimileTelephoneNumber: $facsimileTelephoneNumber\n",
$mobile,
$pager,
$manager,
$secretary,
$roomNumber,
$carLicense,
"l: $locality\n",
"ou: $OrgUnit\n",
"mail: $mail\n",
"postalAddress: $postalAddress\n",
"title: $title\n",
$mycert,
"\n";
if (!$Quiet) {
if ($x % 1000 == 0) {
print ".";
&flush(STDOUT);
}
}
}
print "\n";
print "Generated $x entries\n";
if ($Verbose) {
print "$dups duplicates skipped\n";
}
exit 0;
sub ReadOrgUnits {
open (ORG_UNITS, $OrgUnitsFile) ||
die "Bad news, failed to open Org Units, $OrgUnitsFile: $!\n";
while() {
chop;
push (@OrganizationalUnits, $_);
}
close ORG_UNITS;
}
sub ReadGivenNames {
open (GIVEN_NAMES, $GivenNamesFile) ||
die "Bad News, failed to load given names. $GivenNamesFile\n";
$i = 0;
while () {
chop;
$given_names[$i++] = $_;
}
close GIVEN_NAMES;
}
sub ReadFamilyNames {
open (FAMILY_NAMES, $FamilyNamesFile) ||
die "Bad News, failed to load Family Names. $FamilyNamesFile\n";
$i = 0;
while () {
chop;
$family_names[$i++] = $_;
}
close FAMILY_NAMES;
}
sub PrintPreAmblePiranha {
local($output_file) = @_;
open (OUTPUT_FILE, ">$output_file") || die "Can't open $output_file for writing $!\n";
print OUTPUT_FILE<$output_file") || die "Can't open $output_file for writing $!\n";
print OUTPUT_FILE<$output_file") || die "Can't open $output_file for writing $!\n";
print OUTPUT_FILE< 9) ? $rand_char_index + 55 :
$rand_char_index + 48;
$license .= pack ("c", $ascii_value);
}
return $license;
}
# All entries are added to TheMap which checks to see
# if the name is already there
sub AddAndCheck {
local($RDN) = @_;
# now isn't this better than STL?
if ($TheMap{$RDN}) {
return 1;
}
else {
$TheMap{$RDN} = 1;
return 0;
}
}
sub MakeMailAddress {
local($given_name, $sur_name, $Organization) = @_;
return "$given_name". "_$sur_name\@$Organization";
}
sub MakeRandomPostalAddress {
local ($org, $departmentNumber,$roomNumber, $OrgUnit) = @_;
return "$org, $OrgUnit Dept \#$departmentNumber, Room\#$roomNumber";
}
sub MakeInitials {
local ($givenName, $sn) = @_;
local ($first, $last);
($first) = $givenName =~ /^(\w).*/;
($last) = $sn =~ /^(\w).*/;
return "$first" . ". " . "$last" . ".";
}
--- dbgen.pl DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 20:37:11 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 16:37:11 -0400
Subject: [Fedora-directory-commits] ldapserver/l10n/dirserv/de ns-slapd.txt,
1.4, NONE ns-slapd.txt.iso8859, 1.4, NONE
Message-ID: <200707182037.l6IKbBPm005560@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/l10n/dirserv/de
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/l10n/dirserv/de
Removed Files:
ns-slapd.txt ns-slapd.txt.iso8859
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
--- ns-slapd.txt DELETED ---
--- ns-slapd.txt.iso8859 DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 20:37:11 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 16:37:11 -0400
Subject: [Fedora-directory-commits] ldapserver/l10n/dirserv/en ns-slapd.txt,
1.4, NONE
Message-ID: <200707182037.l6IKbBvm005573@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/l10n/dirserv/en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/l10n/dirserv/en
Removed Files:
ns-slapd.txt
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
--- ns-slapd.txt DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 20:37:11 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 16:37:11 -0400
Subject: [Fedora-directory-commits] ldapserver/l10n/dirserv/es ns-slapd.txt,
1.4, NONE ns-slapd.txt.iso8859, 1.4, NONE
Message-ID: <200707182037.l6IKbBNP005592@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/l10n/dirserv/es
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/l10n/dirserv/es
Removed Files:
ns-slapd.txt ns-slapd.txt.iso8859
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
--- ns-slapd.txt DELETED ---
--- ns-slapd.txt.iso8859 DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 20:37:12 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 16:37:12 -0400
Subject: [Fedora-directory-commits] ldapserver/l10n/dirserv/ja ns-slapd.txt,
1.4, NONE ns-slapd.txt.eucjp, 1.4, NONE
Message-ID: <200707182037.l6IKbCIf005610@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/l10n/dirserv/ja
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/l10n/dirserv/ja
Removed Files:
ns-slapd.txt ns-slapd.txt.eucjp
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
--- ns-slapd.txt DELETED ---
--- ns-slapd.txt.eucjp DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 20:37:12 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 16:37:12 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/include dsalib.h,
1.8, NONE dsalib_pw.h, 1.5, NONE dsalib_schema.h, 1.5,
NONE nterrors.h, 1.5, NONE
Message-ID: <200707182037.l6IKbCXe005611@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/ldap/admin/include
Removed Files:
dsalib.h dsalib_pw.h dsalib_schema.h nterrors.h
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
--- dsalib.h DELETED ---
--- dsalib_pw.h DELETED ---
--- dsalib_schema.h DELETED ---
--- nterrors.h DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 20:37:11 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 16:37:11 -0400
Subject: [Fedora-directory-commits] ldapserver/l10n/dirserv/fr ns-slapd.txt,
1.4, NONE ns-slapd.txt.iso8859, 1.4, NONE
Message-ID: <200707182037.l6IKbCnN005609@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/l10n/dirserv/fr
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/l10n/dirserv/fr
Removed Files:
ns-slapd.txt ns-slapd.txt.iso8859
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
--- ns-slapd.txt DELETED ---
--- ns-slapd.txt.iso8859 DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 20:37:12 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 16:37:12 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/lib dsalib_conf.c,
1.8, NONE dsalib_confs.c, 1.8, NONE dsalib_db.c, 1.7,
NONE dsalib_debug.c, 1.7, NONE dsalib_dn.c, 1.6,
NONE dsalib_filename.c, 1.7, NONE dsalib_html.c, 1.6,
NONE dsalib_ldif.c, 1.7, NONE dsalib_location.c, 1.9,
NONE dsalib_pw.c, 1.7, NONE dsalib_tailf.c, 1.6,
NONE dsalib_updown.c, 1.10, NONE dsalib_util.c, 1.9, NONE
Message-ID: <200707182037.l6IKbCOY005623@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/ldap/admin/lib
Removed Files:
dsalib_conf.c dsalib_confs.c dsalib_db.c dsalib_debug.c
dsalib_dn.c dsalib_filename.c dsalib_html.c dsalib_ldif.c
dsalib_location.c dsalib_pw.c dsalib_tailf.c dsalib_updown.c
dsalib_util.c
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
--- dsalib_conf.c DELETED ---
--- dsalib_confs.c DELETED ---
--- dsalib_db.c DELETED ---
--- dsalib_debug.c DELETED ---
--- dsalib_dn.c DELETED ---
--- dsalib_filename.c DELETED ---
--- dsalib_html.c DELETED ---
--- dsalib_ldif.c DELETED ---
--- dsalib_location.c DELETED ---
--- dsalib_pw.c DELETED ---
--- dsalib_tailf.c DELETED ---
--- dsalib_updown.c DELETED ---
--- dsalib_util.c DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 20:37:13 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 16:37:13 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src CGI_ENV, 1.4,
NONE Cgi.pm, 1.4, NONE cfg_sspt.c, 1.13, NONE cfg_sspt.h, 1.5,
NONE configure_instance.cpp, 1.11, NONE configure_instance.h,
1.5, NONE create_instance.c, 1.63, NONE create_instance.h,
1.18, NONE ds_newinst.c, 1.6, NONE ds_newinst.pl.in, 1.10,
NONE ds_remove_uninst.cpp, 1.8, NONE ds_remove_uninst.h, 1.5,
NONE fix_secmod_db_64, 1.3, NONE getConfigInfo, 1.5,
NONE import2info, 1.5, NONE init_ds_env.c, 1.7,
NONE init_ds_env.h, 1.5, NONE install_keywords.h, 1.5,
NONE instindex.cpp, 1.11, NONE key.rc, 1.4, NONE latest_file.c,
1.8, NONE migrateInstance, 1.5, NONE migrateLocalDB, 1.5,
NONE migratePwdFile, 1.5, NONE migrateTo11.in, 1.2,
NONE migrateTo4, 1.6, NONE migratedsgw, 1.5, NONE namegen.c,
1.7, NONE script-gen.c, 1.7, NONE sec_tools_wrapper, 1.1,
NONE uname.lib, 1.4, NONE updatedsgw, 1.8, NONE
Message-ID: <200707182037.l6IKbDMO005645@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/ldap/admin/src
Removed Files:
CGI_ENV Cgi.pm cfg_sspt.c cfg_sspt.h configure_instance.cpp
configure_instance.h create_instance.c create_instance.h
ds_newinst.c ds_newinst.pl.in ds_remove_uninst.cpp
ds_remove_uninst.h fix_secmod_db_64 getConfigInfo import2info
init_ds_env.c init_ds_env.h install_keywords.h instindex.cpp
key.rc latest_file.c migrateInstance migrateLocalDB
migratePwdFile migrateTo11.in migrateTo4 migratedsgw namegen.c
script-gen.c sec_tools_wrapper uname.lib updatedsgw
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
--- CGI_ENV DELETED ---
--- Cgi.pm DELETED ---
--- cfg_sspt.c DELETED ---
--- cfg_sspt.h DELETED ---
--- configure_instance.cpp DELETED ---
--- configure_instance.h DELETED ---
--- create_instance.c DELETED ---
--- create_instance.h DELETED ---
--- ds_newinst.c DELETED ---
--- ds_newinst.pl.in DELETED ---
--- ds_remove_uninst.cpp DELETED ---
--- ds_remove_uninst.h DELETED ---
--- fix_secmod_db_64 DELETED ---
--- getConfigInfo DELETED ---
--- import2info DELETED ---
--- init_ds_env.c DELETED ---
--- init_ds_env.h DELETED ---
--- install_keywords.h DELETED ---
--- instindex.cpp DELETED ---
--- key.rc DELETED ---
--- latest_file.c DELETED ---
--- migrateInstance DELETED ---
--- migrateLocalDB DELETED ---
--- migratePwdFile DELETED ---
--- migrateTo11.in DELETED ---
--- migrateTo4 DELETED ---
--- migratedsgw DELETED ---
--- namegen.c DELETED ---
--- script-gen.c DELETED ---
--- sec_tools_wrapper DELETED ---
--- uname.lib DELETED ---
--- updatedsgw DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 20:37:13 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 16:37:13 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
Setup.pm.in, 1.8, 1.9 migrate-ds.pl.in, 1.2,
1.3 setup-ds.pl.in, 1.6, 1.7 template-migrate5to7, 1.5,
NONE template-migrate6to7, 1.7, NONE template-migrateInstance7,
1.6, NONE template-migrateTo7, 1.6, NONE
Message-ID: <200707182037.l6IKbDoW005653@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/ldap/admin/src/scripts
Modified Files:
Setup.pm.in migrate-ds.pl.in setup-ds.pl.in
Removed Files:
template-migrate5to7 template-migrate6to7
template-migrateInstance7 template-migrateTo7
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
Index: Setup.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Setup.pm.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Setup.pm.in 29 Jun 2007 21:12:21 -0000 1.8
+++ Setup.pm.in 18 Jul 2007 20:37:11 -0000 1.9
@@ -215,8 +215,17 @@
sub doExit {
my $self = shift;
- $self->msg($FATAL, 'setup_exiting', $self->{log}->{filename});
- exit 1;
+ my $code = shift;
+ if (!defined($code)) {
+ $code = 1;
+ }
+
+ if ($code) {
+ $self->msg($FATAL, 'setup_exiting', $self->{log}->{filename});
+ } else {
+ $self->msg($SUCCESS, 'setup_exiting', $self->{log}->{filename});
+ }
+ exit $code;
}
# get a list of the directory servers in configdir
@@ -238,3 +247,10 @@
# Mandatory TRUE return value.
#
1;
+
+# emacs settings
+# Local Variables:
+# mode:perl
+# indent-tabs-mode: nil
+# tab-width: 4
+# End:
Index: migrate-ds.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/migrate-ds.pl.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- migrate-ds.pl.in 13 Jul 2007 18:35:32 -0000 1.2
+++ migrate-ds.pl.in 18 Jul 2007 20:37:11 -0000 1.3
@@ -62,16 +62,15 @@
$mig->msg('begin_ds_migration', $mig->{oldsroot});
if (!migrateDS($mig)) {
- exit 1;
+ $mig->doExit(1);
}
$mig->msg('end_ds_migration');
+$mig->doExit(0);
END {
if ($mig) {
if (!$mig->{keep}) {
unlink $mig->{inffile};
}
-
- $mig->doExit();
}
}
Index: setup-ds.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.pl.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- setup-ds.pl.in 13 Jul 2007 18:35:32 -0000 1.6
+++ setup-ds.pl.in 18 Jul 2007 20:37:11 -0000 1.7
@@ -76,17 +76,18 @@
$setup->msg(@errs);
$setup->msg($FATAL, 'error_creating_dsinstance',
$setup->{inf}->{slapd}->{ServerIdentifier});
+ $setup->doExit(1);
} else {
$setup->msg('created_dsinstance',
$setup->{inf}->{slapd}->{ServerIdentifier});
}
+$setup->doExit(0);
+
END {
if ($setup) {
if (!$setup->{keep}) {
unlink $setup->{inffile};
}
-
- $setup->doExit();
}
}
--- template-migrate5to7 DELETED ---
--- template-migrate6to7 DELETED ---
--- template-migrateInstance7 DELETED ---
--- template-migrateTo7 DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 20:37:14 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 16:37:14 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/clients Makefile, 1.8,
NONE
Message-ID: <200707182037.l6IKbE4u005658@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/clients
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/ldap/clients
Removed Files:
Makefile
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
--- Makefile DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 20:37:15 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 16:37:15 -0400
Subject: [Fedora-directory-commits] ldapserver/wrappers ds_newinst.in, 1.4,
NONE
Message-ID: <200707182037.l6IKbFJu005663@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/wrappers
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/wrappers
Removed Files:
ds_newinst.in
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
--- ds_newinst.in DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 20:37:10 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 16:37:10 -0400
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.49,
1.50 aclocal.m4, 1.41, 1.42 configure, 1.52, 1.53 missing,
1.31, 1.32 install-sh, 1.31, 1.32 depcomp, 1.31, 1.32 compile,
1.31, 1.32 Makefile.in, 1.58, 1.59 config.sub, 1.30,
1.31 config.guess, 1.30, 1.31 bchecker.ini, 1.1.1.1,
NONE nsarch, 1.7, NONE nsarch.bat, 1.4, NONE ntversion.pl, 1.5,
NONE pumpkin.pl, 1.5, NONE
Message-ID: <200707182037.l6IKbehm005678@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh depcomp
compile Makefile.in config.sub config.guess
Removed Files:
bchecker.ini nsarch nsarch.bat ntversion.pl pumpkin.pl
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Makefile.am 13 Jul 2007 18:35:32 -0000 1.49
+++ Makefile.am 18 Jul 2007 20:37:07 -0000 1.50
@@ -90,10 +90,10 @@
#------------------------
sbin_PROGRAMS = ns-slapd
-bin_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin infadd-bin ldap-agent-bin \
+bin_PROGRAMS = dbscan-bin dsktune-bin infadd-bin ldap-agent-bin \
ldclt-bin ldif-bin migratecred-bin mmldif-bin pwdhash-bin rsearch-bin
-server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la
+server_LTLIBRARIES = libslapd.la libns-dshttpd.la
# this is how to add optional plugins
if enable_pam_passthru
@@ -178,17 +178,14 @@
$(srcdir)/ldap/schema/60pam-plugin.ldif \
$(srcdir)/ldap/schema/99user.ldif
-bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
+bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
wrappers/dbscan \
- wrappers/ds_newinst \
- ldap/admin/src/ds_newinst.pl \
wrappers/dsktune \
wrappers/infadd \
wrappers/ldap-agent \
wrappers/ldclt \
wrappers/ldif \
$(srcdir)/ldap/admin/src/logconv.pl \
- ldap/admin/src/migrateTo11 \
wrappers/migratecred \
wrappers/mmldif \
wrappers/pwdhash \
@@ -241,11 +238,7 @@
ldap/admin/src/scripts/template-ns-activate.pl \
ldap/admin/src/scripts/template-ns-inactivate.pl \
ldap/admin/src/scripts/template-ns-newpwpolicy.pl \
- ldap/admin/src/scripts/template-verify-db.pl \
- $(srcdir)/ldap/admin/src/scripts/template-migrate5to7 \
- $(srcdir)/ldap/admin/src/scripts/template-migrate6to7 \
- $(srcdir)/ldap/admin/src/scripts/template-migrateInstance7 \
- $(srcdir)/ldap/admin/src/scripts/template-migrateTo7
+ ldap/admin/src/scripts/template-verify-db.pl
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
@@ -305,26 +298,6 @@
#////////////////////////////////////////////////////////////////
#------------------------
-# libds_admin
-#------------------------
-libds_admin_la_SOURCES = ldap/admin/lib/dsalib_conf.c \
- ldap/admin/lib/dsalib_confs.c \
- ldap/admin/lib/dsalib_db.c \
- ldap/admin/lib/dsalib_debug.c \
- ldap/admin/lib/dsalib_dn.c \
- ldap/admin/lib/dsalib_filename.c \
- ldap/admin/lib/dsalib_html.c \
- ldap/admin/lib/dsalib_ldif.c \
- ldap/admin/lib/dsalib_location.c \
- ldap/admin/lib/dsalib_pw.c \
- ldap/admin/lib/dsalib_tailf.c \
- ldap/admin/lib/dsalib_updown.c \
- ldap/admin/lib/dsalib_util.c
-
-libds_admin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-libds_admin_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK)
-
-#------------------------
# libns-dshttpd
#------------------------
libns_dshttpd_la_SOURCES = lib/libaccess/access_plhash.cpp \
@@ -865,17 +838,6 @@
dbscan_bin_LDADD = $(NSPR_LINK) $(DB_LINK)
#------------------------
-# ds_newinst
-#------------------------
-ds_newinst_bin_SOURCES = ldap/admin/src/cfg_sspt.c \
- ldap/admin/src/create_instance.c \
- ldap/admin/src/ds_newinst.c \
- ldap/admin/src/script-gen.c
-
-ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
-
-#------------------------
# dsktune
#------------------------
dsktune_bin_SOURCES = ldap/systools/idsktune.c \
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Makefile.in 13 Jul 2007 18:35:32 -0000 1.58
+++ Makefile.in 18 Jul 2007 20:37:08 -0000 1.59
@@ -41,10 +41,9 @@
build_triplet = @build@
host_triplet = @host@
sbin_PROGRAMS = ns-slapd$(EXEEXT)
-bin_PROGRAMS = dbscan-bin$(EXEEXT) ds_newinst-bin$(EXEEXT) \
- dsktune-bin$(EXEEXT) infadd-bin$(EXEEXT) \
- ldap-agent-bin$(EXEEXT) ldclt-bin$(EXEEXT) ldif-bin$(EXEEXT) \
- migratecred-bin$(EXEEXT) mmldif-bin$(EXEEXT) \
+bin_PROGRAMS = dbscan-bin$(EXEEXT) dsktune-bin$(EXEEXT) \
+ infadd-bin$(EXEEXT) ldap-agent-bin$(EXEEXT) ldclt-bin$(EXEEXT) \
+ ldif-bin$(EXEEXT) migratecred-bin$(EXEEXT) mmldif-bin$(EXEEXT) \
pwdhash-bin$(EXEEXT) rsearch-bin$(EXEEXT)
noinst_PROGRAMS = makstrdb$(EXEEXT)
@SOLARIS_TRUE at am__append_1 = ldap/servers/slapd/tools/ldclt/opCheck.c
@@ -246,24 +245,6 @@
ldap/servers/plugins/dna/libdna_plugin_la-dna.lo
libdna_plugin_la_OBJECTS = $(am_libdna_plugin_la_OBJECTS)
@enable_dna_TRUE at am_libdna_plugin_la_rpath = -rpath $(serverplugindir)
-libds_admin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
-am_libds_admin_la_OBJECTS = \
- ldap/admin/lib/libds_admin_la-dsalib_conf.lo \
- ldap/admin/lib/libds_admin_la-dsalib_confs.lo \
- ldap/admin/lib/libds_admin_la-dsalib_db.lo \
- ldap/admin/lib/libds_admin_la-dsalib_debug.lo \
- ldap/admin/lib/libds_admin_la-dsalib_dn.lo \
- ldap/admin/lib/libds_admin_la-dsalib_filename.lo \
- ldap/admin/lib/libds_admin_la-dsalib_html.lo \
- ldap/admin/lib/libds_admin_la-dsalib_ldif.lo \
- ldap/admin/lib/libds_admin_la-dsalib_location.lo \
- ldap/admin/lib/libds_admin_la-dsalib_pw.lo \
- ldap/admin/lib/libds_admin_la-dsalib_tailf.lo \
- ldap/admin/lib/libds_admin_la-dsalib_updown.lo \
- ldap/admin/lib/libds_admin_la-dsalib_util.lo
-libds_admin_la_OBJECTS = $(am_libds_admin_la_OBJECTS)
libhttp_client_plugin_la_LIBADD =
am_libhttp_client_plugin_la_OBJECTS = ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo \
ldap/servers/plugins/http/libhttp_client_plugin_la-http_impl.lo
@@ -562,16 +543,6 @@
ldap/servers/slapd/tools/dbscan_bin-dbscan.$(OBJEXT)
dbscan_bin_OBJECTS = $(am_dbscan_bin_OBJECTS)
dbscan_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_ds_newinst_bin_OBJECTS = \
- ldap/admin/src/ds_newinst_bin-cfg_sspt.$(OBJEXT) \
- ldap/admin/src/ds_newinst_bin-create_instance.$(OBJEXT) \
- ldap/admin/src/ds_newinst_bin-ds_newinst.$(OBJEXT) \
- ldap/admin/src/ds_newinst_bin-script-gen.$(OBJEXT)
-ds_newinst_bin_OBJECTS = $(am_ds_newinst_bin_OBJECTS)
-ds_newinst_bin_DEPENDENCIES = libds_admin.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
am_dsktune_bin_OBJECTS = ldap/systools/idsktune.$(OBJEXT) \
ldap/systools/pio.$(OBJEXT)
dsktune_bin_OBJECTS = $(am_dsktune_bin_OBJECTS)
@@ -746,7 +717,7 @@
$(libchainingdb_plugin_la_SOURCES) \
$(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) \
$(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) \
- $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) \
+ $(libdna_plugin_la_SOURCES) \
$(libhttp_client_plugin_la_SOURCES) \
$(libns_dshttpd_la_SOURCES) \
$(libpam_passthru_plugin_la_SOURCES) \
@@ -758,10 +729,9 @@
$(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) \
$(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) \
$(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) \
- $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) \
- $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) \
- $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) \
- $(ldif_bin_SOURCES) $(makstrdb_SOURCES) \
+ $(dbscan_bin_SOURCES) $(dsktune_bin_SOURCES) \
+ $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) \
+ $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES) \
$(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) \
$(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) \
$(rsearch_bin_SOURCES)
@@ -772,7 +742,7 @@
$(libchainingdb_plugin_la_SOURCES) \
$(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) \
$(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) \
- $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) \
+ $(libdna_plugin_la_SOURCES) \
$(libhttp_client_plugin_la_SOURCES) \
$(libns_dshttpd_la_SOURCES) \
$(libpam_passthru_plugin_la_SOURCES) \
@@ -784,13 +754,12 @@
$(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) \
$(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) \
$(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) \
- $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) \
- $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) \
- $(ldap_agent_bin_SOURCES) $(am__ldclt_bin_SOURCES_DIST) \
- $(ldif_bin_SOURCES) $(makstrdb_SOURCES) \
- $(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) \
- $(am__ns_slapd_SOURCES_DIST) $(pwdhash_bin_SOURCES) \
- $(rsearch_bin_SOURCES)
+ $(dbscan_bin_SOURCES) $(dsktune_bin_SOURCES) \
+ $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) \
+ $(am__ldclt_bin_SOURCES_DIST) $(ldif_bin_SOURCES) \
+ $(makstrdb_SOURCES) $(migratecred_bin_SOURCES) \
+ $(mmldif_bin_SOURCES) $(am__ns_slapd_SOURCES_DIST) \
+ $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES)
configDATA_INSTALL = $(INSTALL_DATA)
infDATA_INSTALL = $(INSTALL_DATA)
nodist_propertyDATA_INSTALL = $(INSTALL_DATA)
@@ -1042,7 +1011,7 @@
BUILT_SOURCES = dirver.h dberrstrs.h
CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties
taskdir = $(datadir)@scripttemplatedir@
-server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la
+server_LTLIBRARIES = libslapd.la libns-dshttpd.la
# this is how to add optional plugins
@enable_pam_passthru_TRUE at LIBPAM_PASSTHRU_PLUGIN = libpam-passthru-plugin.la
@@ -1116,17 +1085,14 @@
$(srcdir)/ldap/schema/60pam-plugin.ldif \
$(srcdir)/ldap/schema/99user.ldif
-bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
+bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
wrappers/dbscan \
- wrappers/ds_newinst \
- ldap/admin/src/ds_newinst.pl \
wrappers/dsktune \
wrappers/infadd \
wrappers/ldap-agent \
wrappers/ldclt \
wrappers/ldif \
$(srcdir)/ldap/admin/src/logconv.pl \
- ldap/admin/src/migrateTo11 \
wrappers/migratecred \
wrappers/mmldif \
wrappers/pwdhash \
@@ -1179,11 +1145,7 @@
ldap/admin/src/scripts/template-ns-activate.pl \
ldap/admin/src/scripts/template-ns-inactivate.pl \
ldap/admin/src/scripts/template-ns-newpwpolicy.pl \
- ldap/admin/src/scripts/template-verify-db.pl \
- $(srcdir)/ldap/admin/src/scripts/template-migrate5to7 \
- $(srcdir)/ldap/admin/src/scripts/template-migrate6to7 \
- $(srcdir)/ldap/admin/src/scripts/template-migrateInstance7 \
- $(srcdir)/ldap/admin/src/scripts/template-migrateTo7
+ ldap/admin/src/scripts/template-verify-db.pl
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
inf_DATA = ldap/admin/src/slapd.inf \
@@ -1234,26 +1196,6 @@
#////////////////////////////////////////////////////////////////
#------------------------
-# libds_admin
-#------------------------
-libds_admin_la_SOURCES = ldap/admin/lib/dsalib_conf.c \
- ldap/admin/lib/dsalib_confs.c \
- ldap/admin/lib/dsalib_db.c \
- ldap/admin/lib/dsalib_debug.c \
- ldap/admin/lib/dsalib_dn.c \
- ldap/admin/lib/dsalib_filename.c \
- ldap/admin/lib/dsalib_html.c \
- ldap/admin/lib/dsalib_ldif.c \
- ldap/admin/lib/dsalib_location.c \
- ldap/admin/lib/dsalib_pw.c \
- ldap/admin/lib/dsalib_tailf.c \
- ldap/admin/lib/dsalib_updown.c \
- ldap/admin/lib/dsalib_util.c
-
-libds_admin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-libds_admin_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK)
-
-#------------------------
# libns-dshttpd
#------------------------
libns_dshttpd_la_SOURCES = lib/libaccess/access_plhash.cpp \
@@ -1784,17 +1726,6 @@
dbscan_bin_LDADD = $(NSPR_LINK) $(DB_LINK)
#------------------------
-# ds_newinst
-#------------------------
-ds_newinst_bin_SOURCES = ldap/admin/src/cfg_sspt.c \
- ldap/admin/src/create_instance.c \
- ldap/admin/src/ds_newinst.c \
- ldap/admin/src/script-gen.c
-
-ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
-
-#------------------------
# dsktune
#------------------------
dsktune_bin_SOURCES = ldap/systools/idsktune.c \
@@ -2597,53 +2528,6 @@
ldap/servers/plugins/dna/$(DEPDIR)/$(am__dirstamp)
libdna-plugin.la: $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_DEPENDENCIES)
$(LINK) $(am_libdna_plugin_la_rpath) $(libdna_plugin_la_LDFLAGS) $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_LIBADD) $(LIBS)
-ldap/admin/lib/$(am__dirstamp):
- @$(mkdir_p) ldap/admin/lib
- @: > ldap/admin/lib/$(am__dirstamp)
-ldap/admin/lib/$(DEPDIR)/$(am__dirstamp):
- @$(mkdir_p) ldap/admin/lib/$(DEPDIR)
- @: > ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_conf.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_confs.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_db.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_debug.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_dn.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_filename.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_html.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_ldif.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_location.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_pw.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_tailf.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_updown.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_util.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-libds_admin.la: $(libds_admin_la_OBJECTS) $(libds_admin_la_DEPENDENCIES)
- $(LINK) -rpath $(serverdir) $(libds_admin_la_LDFLAGS) $(libds_admin_la_OBJECTS) $(libds_admin_la_LIBADD) $(LIBS)
ldap/servers/plugins/http/$(am__dirstamp):
@$(mkdir_p) ldap/servers/plugins/http
@: > ldap/servers/plugins/http/$(am__dirstamp)
@@ -3557,27 +3441,6 @@
dbscan-bin$(EXEEXT): $(dbscan_bin_OBJECTS) $(dbscan_bin_DEPENDENCIES)
@rm -f dbscan-bin$(EXEEXT)
$(LINK) $(dbscan_bin_LDFLAGS) $(dbscan_bin_OBJECTS) $(dbscan_bin_LDADD) $(LIBS)
-ldap/admin/src/$(am__dirstamp):
- @$(mkdir_p) ldap/admin/src
- @: > ldap/admin/src/$(am__dirstamp)
-ldap/admin/src/$(DEPDIR)/$(am__dirstamp):
- @$(mkdir_p) ldap/admin/src/$(DEPDIR)
- @: > ldap/admin/src/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/src/ds_newinst_bin-cfg_sspt.$(OBJEXT): \
- ldap/admin/src/$(am__dirstamp) \
- ldap/admin/src/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/src/ds_newinst_bin-create_instance.$(OBJEXT): \
- ldap/admin/src/$(am__dirstamp) \
- ldap/admin/src/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/src/ds_newinst_bin-ds_newinst.$(OBJEXT): \
- ldap/admin/src/$(am__dirstamp) \
- ldap/admin/src/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/src/ds_newinst_bin-script-gen.$(OBJEXT): \
- ldap/admin/src/$(am__dirstamp) \
- ldap/admin/src/$(DEPDIR)/$(am__dirstamp)
-ds_newinst-bin$(EXEEXT): $(ds_newinst_bin_OBJECTS) $(ds_newinst_bin_DEPENDENCIES)
- @rm -f ds_newinst-bin$(EXEEXT)
- $(LINK) $(ds_newinst_bin_LDFLAGS) $(ds_newinst_bin_OBJECTS) $(ds_newinst_bin_LDADD) $(LIBS)
ldap/systools/$(am__dirstamp):
@$(mkdir_p) ldap/systools
@: > ldap/systools/$(am__dirstamp)
@@ -3904,36 +3767,6 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_conf.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_conf.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_confs.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_confs.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_db.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_db.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_debug.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_debug.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_dn.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_dn.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_filename.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_filename.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_html.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_html.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_ldif.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_ldif.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_location.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_location.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_pw.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_pw.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_tailf.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_tailf.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_updown.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_updown.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_util.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_util.lo
- -rm -f ldap/admin/src/ds_newinst_bin-cfg_sspt.$(OBJEXT)
- -rm -f ldap/admin/src/ds_newinst_bin-create_instance.$(OBJEXT)
- -rm -f ldap/admin/src/ds_newinst_bin-ds_newinst.$(OBJEXT)
- -rm -f ldap/admin/src/ds_newinst_bin-script-gen.$(OBJEXT)
-rm -f ldap/libraries/libavl/avl.$(OBJEXT)
-rm -f ldap/libraries/libavl/libslapd_la-avl.$(OBJEXT)
-rm -f ldap/libraries/libavl/libslapd_la-avl.lo
@@ -4719,23 +4552,6 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ldap/libraries/libavl/$(DEPDIR)/avl.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ldap/libraries/libavl/$(DEPDIR)/libslapd_la-avl.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo at am__quote@
@@ -6071,97 +5887,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdna_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/dna/libdna_plugin_la-dna.lo `test -f 'ldap/servers/plugins/dna/dna.c' || echo '$(srcdir)/'`ldap/servers/plugins/dna/dna.c
-ldap/admin/lib/libds_admin_la-dsalib_conf.lo: ldap/admin/lib/dsalib_conf.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_conf.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_conf.lo `test -f 'ldap/admin/lib/dsalib_conf.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_conf.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_conf.c' object='ldap/admin/lib/libds_admin_la-dsalib_conf.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_conf.lo `test -f 'ldap/admin/lib/dsalib_conf.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_conf.c
-
-ldap/admin/lib/libds_admin_la-dsalib_confs.lo: ldap/admin/lib/dsalib_confs.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_confs.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_confs.lo `test -f 'ldap/admin/lib/dsalib_confs.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_confs.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_confs.c' object='ldap/admin/lib/libds_admin_la-dsalib_confs.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_confs.lo `test -f 'ldap/admin/lib/dsalib_confs.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_confs.c
-
-ldap/admin/lib/libds_admin_la-dsalib_db.lo: ldap/admin/lib/dsalib_db.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_db.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_db.lo `test -f 'ldap/admin/lib/dsalib_db.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_db.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_db.c' object='ldap/admin/lib/libds_admin_la-dsalib_db.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_db.lo `test -f 'ldap/admin/lib/dsalib_db.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_db.c
-
-ldap/admin/lib/libds_admin_la-dsalib_debug.lo: ldap/admin/lib/dsalib_debug.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_debug.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_debug.lo `test -f 'ldap/admin/lib/dsalib_debug.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_debug.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_debug.c' object='ldap/admin/lib/libds_admin_la-dsalib_debug.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_debug.lo `test -f 'ldap/admin/lib/dsalib_debug.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_debug.c
-
-ldap/admin/lib/libds_admin_la-dsalib_dn.lo: ldap/admin/lib/dsalib_dn.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_dn.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_dn.lo `test -f 'ldap/admin/lib/dsalib_dn.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_dn.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_dn.c' object='ldap/admin/lib/libds_admin_la-dsalib_dn.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_dn.lo `test -f 'ldap/admin/lib/dsalib_dn.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_dn.c
-
-ldap/admin/lib/libds_admin_la-dsalib_filename.lo: ldap/admin/lib/dsalib_filename.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_filename.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_filename.lo `test -f 'ldap/admin/lib/dsalib_filename.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_filename.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_filename.c' object='ldap/admin/lib/libds_admin_la-dsalib_filename.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_filename.lo `test -f 'ldap/admin/lib/dsalib_filename.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_filename.c
-
-ldap/admin/lib/libds_admin_la-dsalib_html.lo: ldap/admin/lib/dsalib_html.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_html.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_html.lo `test -f 'ldap/admin/lib/dsalib_html.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_html.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_html.c' object='ldap/admin/lib/libds_admin_la-dsalib_html.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_html.lo `test -f 'ldap/admin/lib/dsalib_html.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_html.c
-
-ldap/admin/lib/libds_admin_la-dsalib_ldif.lo: ldap/admin/lib/dsalib_ldif.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_ldif.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_ldif.lo `test -f 'ldap/admin/lib/dsalib_ldif.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_ldif.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_ldif.c' object='ldap/admin/lib/libds_admin_la-dsalib_ldif.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_ldif.lo `test -f 'ldap/admin/lib/dsalib_ldif.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_ldif.c
-
-ldap/admin/lib/libds_admin_la-dsalib_location.lo: ldap/admin/lib/dsalib_location.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_location.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_location.lo `test -f 'ldap/admin/lib/dsalib_location.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_location.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_location.c' object='ldap/admin/lib/libds_admin_la-dsalib_location.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_location.lo `test -f 'ldap/admin/lib/dsalib_location.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_location.c
-
-ldap/admin/lib/libds_admin_la-dsalib_pw.lo: ldap/admin/lib/dsalib_pw.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_pw.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_pw.lo `test -f 'ldap/admin/lib/dsalib_pw.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_pw.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_pw.c' object='ldap/admin/lib/libds_admin_la-dsalib_pw.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_pw.lo `test -f 'ldap/admin/lib/dsalib_pw.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_pw.c
-
-ldap/admin/lib/libds_admin_la-dsalib_tailf.lo: ldap/admin/lib/dsalib_tailf.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_tailf.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_tailf.lo `test -f 'ldap/admin/lib/dsalib_tailf.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_tailf.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_tailf.c' object='ldap/admin/lib/libds_admin_la-dsalib_tailf.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_tailf.lo `test -f 'ldap/admin/lib/dsalib_tailf.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_tailf.c
-
-ldap/admin/lib/libds_admin_la-dsalib_updown.lo: ldap/admin/lib/dsalib_updown.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_updown.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_updown.lo `test -f 'ldap/admin/lib/dsalib_updown.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_updown.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_updown.c' object='ldap/admin/lib/libds_admin_la-dsalib_updown.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_updown.lo `test -f 'ldap/admin/lib/dsalib_updown.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_updown.c
-
-ldap/admin/lib/libds_admin_la-dsalib_util.lo: ldap/admin/lib/dsalib_util.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_util.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_util.lo `test -f 'ldap/admin/lib/dsalib_util.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_util.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_util.c' object='ldap/admin/lib/libds_admin_la-dsalib_util.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_util.lo `test -f 'ldap/admin/lib/dsalib_util.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_util.c
-
ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo: ldap/servers/plugins/http/http_client.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhttp_client_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo -MD -MP -MF "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Tpo" -c -o ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo `test -f 'ldap/servers/plugins/http/http_client.c' || echo '$(srcdir)/'`ldap/servers/plugins/http/http_client.c; \
@am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Tpo" "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Plo"; else rm -f "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Tpo"; exit 1; fi
@@ -7611,62 +7336,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dbscan_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/tools/dbscan_bin-dbscan.obj `if test -f 'ldap/servers/slapd/tools/dbscan.c'; then $(CYGPATH_W) 'ldap/servers/slapd/tools/dbscan.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/tools/dbscan.c'; fi`
-ldap/admin/src/ds_newinst_bin-cfg_sspt.o: ldap/admin/src/cfg_sspt.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-cfg_sspt.o -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo" -c -o ldap/admin/src/ds_newinst_bin-cfg_sspt.o `test -f 'ldap/admin/src/cfg_sspt.c' || echo '$(srcdir)/'`ldap/admin/src/cfg_sspt.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/cfg_sspt.c' object='ldap/admin/src/ds_newinst_bin-cfg_sspt.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-cfg_sspt.o `test -f 'ldap/admin/src/cfg_sspt.c' || echo '$(srcdir)/'`ldap/admin/src/cfg_sspt.c
-
-ldap/admin/src/ds_newinst_bin-cfg_sspt.obj: ldap/admin/src/cfg_sspt.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-cfg_sspt.obj -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo" -c -o ldap/admin/src/ds_newinst_bin-cfg_sspt.obj `if test -f 'ldap/admin/src/cfg_sspt.c'; then $(CYGPATH_W) 'ldap/admin/src/cfg_sspt.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/cfg_sspt.c'; fi`; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/cfg_sspt.c' object='ldap/admin/src/ds_newinst_bin-cfg_sspt.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-cfg_sspt.obj `if test -f 'ldap/admin/src/cfg_sspt.c'; then $(CYGPATH_W) 'ldap/admin/src/cfg_sspt.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/cfg_sspt.c'; fi`
-
-ldap/admin/src/ds_newinst_bin-create_instance.o: ldap/admin/src/create_instance.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-create_instance.o -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo" -c -o ldap/admin/src/ds_newinst_bin-create_instance.o `test -f 'ldap/admin/src/create_instance.c' || echo '$(srcdir)/'`ldap/admin/src/create_instance.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/create_instance.c' object='ldap/admin/src/ds_newinst_bin-create_instance.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-create_instance.o `test -f 'ldap/admin/src/create_instance.c' || echo '$(srcdir)/'`ldap/admin/src/create_instance.c
-
-ldap/admin/src/ds_newinst_bin-create_instance.obj: ldap/admin/src/create_instance.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-create_instance.obj -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo" -c -o ldap/admin/src/ds_newinst_bin-create_instance.obj `if test -f 'ldap/admin/src/create_instance.c'; then $(CYGPATH_W) 'ldap/admin/src/create_instance.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/create_instance.c'; fi`; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/create_instance.c' object='ldap/admin/src/ds_newinst_bin-create_instance.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-create_instance.obj `if test -f 'ldap/admin/src/create_instance.c'; then $(CYGPATH_W) 'ldap/admin/src/create_instance.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/create_instance.c'; fi`
-
-ldap/admin/src/ds_newinst_bin-ds_newinst.o: ldap/admin/src/ds_newinst.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-ds_newinst.o -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo" -c -o ldap/admin/src/ds_newinst_bin-ds_newinst.o `test -f 'ldap/admin/src/ds_newinst.c' || echo '$(srcdir)/'`ldap/admin/src/ds_newinst.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/ds_newinst.c' object='ldap/admin/src/ds_newinst_bin-ds_newinst.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-ds_newinst.o `test -f 'ldap/admin/src/ds_newinst.c' || echo '$(srcdir)/'`ldap/admin/src/ds_newinst.c
-
-ldap/admin/src/ds_newinst_bin-ds_newinst.obj: ldap/admin/src/ds_newinst.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-ds_newinst.obj -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo" -c -o ldap/admin/src/ds_newinst_bin-ds_newinst.obj `if test -f 'ldap/admin/src/ds_newinst.c'; then $(CYGPATH_W) 'ldap/admin/src/ds_newinst.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/ds_newinst.c'; fi`; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/ds_newinst.c' object='ldap/admin/src/ds_newinst_bin-ds_newinst.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-ds_newinst.obj `if test -f 'ldap/admin/src/ds_newinst.c'; then $(CYGPATH_W) 'ldap/admin/src/ds_newinst.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/ds_newinst.c'; fi`
-
-ldap/admin/src/ds_newinst_bin-script-gen.o: ldap/admin/src/script-gen.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-script-gen.o -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo" -c -o ldap/admin/src/ds_newinst_bin-script-gen.o `test -f 'ldap/admin/src/script-gen.c' || echo '$(srcdir)/'`ldap/admin/src/script-gen.c; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/script-gen.c' object='ldap/admin/src/ds_newinst_bin-script-gen.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-script-gen.o `test -f 'ldap/admin/src/script-gen.c' || echo '$(srcdir)/'`ldap/admin/src/script-gen.c
-
-ldap/admin/src/ds_newinst_bin-script-gen.obj: ldap/admin/src/script-gen.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-script-gen.obj -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo" -c -o ldap/admin/src/ds_newinst_bin-script-gen.obj `if test -f 'ldap/admin/src/script-gen.c'; then $(CYGPATH_W) 'ldap/admin/src/script-gen.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/script-gen.c'; fi`; \
- at am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/script-gen.c' object='ldap/admin/src/ds_newinst_bin-script-gen.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-script-gen.obj `if test -f 'ldap/admin/src/script-gen.c'; then $(CYGPATH_W) 'ldap/admin/src/script-gen.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/script-gen.c'; fi`
-
ldap/servers/slapd/tools/rsearch/infadd_bin-addthread.o: ldap/servers/slapd/tools/rsearch/addthread.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(infadd_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/tools/rsearch/infadd_bin-addthread.o -MD -MP -MF "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/infadd_bin-addthread.Tpo" -c -o ldap/servers/slapd/tools/rsearch/infadd_bin-addthread.o `test -f 'ldap/servers/slapd/tools/rsearch/addthread.c' || echo '$(srcdir)/'`ldap/servers/slapd/tools/rsearch/addthread.c; \
@am__fastdepCC_TRUE@ then mv -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/infadd_bin-addthread.Tpo" "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/infadd_bin-addthread.Po"; else rm -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/infadd_bin-addthread.Tpo"; exit 1; fi
@@ -8844,7 +8513,6 @@
clean-libtool:
-rm -rf .libs _libs
- -rm -rf ldap/admin/lib/.libs ldap/admin/lib/_libs
-rm -rf ldap/libraries/libavl/.libs ldap/libraries/libavl/_libs
-rm -rf ldap/servers/plugins/acl/.libs ldap/servers/plugins/acl/_libs
-rm -rf ldap/servers/plugins/bitwise/.libs ldap/servers/plugins/bitwise/_libs
@@ -9188,10 +8856,6 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -rm -f ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
- -rm -f ldap/admin/lib/$(am__dirstamp)
- -rm -f ldap/admin/src/$(DEPDIR)/$(am__dirstamp)
- -rm -f ldap/admin/src/$(am__dirstamp)
-rm -f ldap/libraries/libavl/$(DEPDIR)/$(am__dirstamp)
-rm -f ldap/libraries/libavl/$(am__dirstamp)
-rm -f ldap/servers/plugins/acl/$(DEPDIR)/$(am__dirstamp)
@@ -9276,7 +8940,7 @@
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/se!
rvers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR)
+ -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd!
/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -9310,7 +8974,7 @@
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/se!
rvers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR)
+ -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd!
/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
--- bchecker.ini DELETED ---
--- nsarch DELETED ---
--- nsarch.bat DELETED ---
--- ntversion.pl DELETED ---
--- pumpkin.pl DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 20:43:16 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 16:43:16 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
migrate-ds-admin.pl.in, 1.4, 1.5 setup-ds-admin.pl.in, 1.8, 1.9
Message-ID: <200707182043.l6IKhG8P005798@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5779/adminserver/admserv/newinst/src
Modified Files:
migrate-ds-admin.pl.in setup-ds-admin.pl.in
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
Index: migrate-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/migrate-ds-admin.pl.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- migrate-ds-admin.pl.in 13 Jul 2007 18:39:15 -0000 1.4
+++ migrate-ds-admin.pl.in 18 Jul 2007 20:43:14 -0000 1.5
@@ -60,7 +60,7 @@
if (!$mig->{inf}->{General}->{ConfigDirectoryAdminPwd}) {
$mig->msg('error_configds_adminpwd_required');
- exit 1;
+ $mig->doExit(1);
}
# first, migrate directory server instances
@@ -68,7 +68,7 @@
# should have already migrated the config DS
$mig->msg('begin_ds_migration', $mig->{oldsroot});
if (!migrateDS($mig)) {
- exit 1;
+ $mig->doExit(1);
}
# if the config ds is on the local machine, shut down the old one
@@ -83,7 +83,7 @@
# next, migrate the admin server - this also registers the directory servers
$mig->msg('begin_as_migration', $mig->{oldsroot});
if (!migrateAdminServer($mig)) {
- exit 1;
+ $mig->doExit(1);
}
# next, register/update the new directory servers
@@ -94,17 +94,17 @@
$mig->{configdir},
@{$mig->{instances}})) {
$mig->msg($FATAL, @errs);
- exit 1;
+ $mig->doExit(1);
}
$mig->msg('end_dsadmin_migration');
+$mig->doExit(0);
+
END {
if ($mig) {
if (!$mig->{keep}) {
unlink $mig->{inffile};
}
-
- $mig->doExit();
}
}
Index: setup-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- setup-ds-admin.pl.in 13 Jul 2007 18:39:15 -0000 1.8
+++ setup-ds-admin.pl.in 18 Jul 2007 20:43:14 -0000 1.9
@@ -123,7 +123,7 @@
my $rc = $dialogmgr->run();
if ($rc) {
- $setup->doExit();
+ $setup->doExit($rc);
}
}
@@ -150,7 +150,7 @@
if (@errs) {
$setup->msg(@errs);
$setup->msg($FATAL, 'error_creating_dsinstance', $setup->{inf}->{slapd}->{ServerIdentifier});
- exit 1;
+ $setup->doExit(1);
} else {
$setup->msg('created_dsinstance', $setup->{inf}->{slapd}->{ServerIdentifier});
}
@@ -161,7 +161,7 @@
if (!createConfigDS($setup->{inf}, \@errs)) {
$setup->msg($FATAL, @errs);
$setup->msg($FATAL, 'error_create_configds');
- exit 1;
+ $setup->doExit(1);
}
}
else
@@ -170,7 +170,7 @@
if (!createSubDS($setup->{inf}, \@errs)) {
$setup->msg($FATAL, @errs);
$setup->msg($FATAL, 'error_create_configds');
- exit 1;
+ $setup->doExit(1);
}
}
@@ -180,7 +180,7 @@
$setup->{inf})) {
$setup->msg(@errs);
$setup->msg($FATAL, 'error_register_dirserver');
- exit 1;
+ $setup->doExit(1);
}
@@ -188,23 +188,21 @@
if (!$setup->{reconfigas}) {
if (!createAdminServer($setup)) {
$setup->msg($FATAL, 'error_create_adminserver');
- exit 1;
+ $setup->doExit(1);
}
} else {
if (!reconfigAdminServer($setup)) {
$setup->msg($FATAL, 'error_reconfig_adminserver');
- exit 1;
+ $setup->doExit(1);
}
}
-$setup->msg($SUCCESS, 'setup_complete');
+$setup->doExit(0);
END {
if ($setup) {
if (!$setup->{keep}) {
unlink $setup->{inffile};
}
-
- $setup->doExit();
}
}
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:23 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:23 -0400
Subject: [Fedora-directory-commits] adminserver bchecker.ini, 1.1.1.1,
NONE buildpaths.mk, 1.11, NONE components.mk, 1.55,
NONE internal_buildpaths.mk, 1.6, NONE nsarch, 1.5,
NONE nsarch.bat, 1.1.1.1, NONE nsconfig.mk, 1.33,
NONE nsdefs.mk, 1.11, NONE nsperl.mk, 1.6, NONE ntbomb.pl, 1.3,
NONE ntversion.pl, 1.4, NONE pumpkin.pl, 1.3, NONE webint.mk,
1.1, NONE
Message-ID: <200707182210.l6IMANbM028533@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver
Removed Files:
bchecker.ini buildpaths.mk components.mk
internal_buildpaths.mk nsarch nsarch.bat nsconfig.mk nsdefs.mk
nsperl.mk ntbomb.pl ntversion.pl pumpkin.pl webint.mk
Log Message:
remove obsolete files and directories
--- bchecker.ini DELETED ---
--- buildpaths.mk DELETED ---
--- components.mk DELETED ---
--- internal_buildpaths.mk DELETED ---
--- nsarch DELETED ---
--- nsarch.bat DELETED ---
--- nsconfig.mk DELETED ---
--- nsdefs.mk DELETED ---
--- nsperl.mk DELETED ---
--- ntbomb.pl DELETED ---
--- ntversion.pl DELETED ---
--- pumpkin.pl DELETED ---
--- webint.mk DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:23 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:23 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff Makefile,
1.5, NONE
Message-ID: <200707182210.l6IMAN6M028534@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/cfgstuff
Removed Files:
Makefile
Log Message:
remove obsolete files and directories
--- Makefile DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:24 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:24 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src
dbtcgiadmin.h, 1.3, NONE
Message-ID: <200707182210.l6IMAOp2028539@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/cgi-src
Removed Files:
dbtcgiadmin.h
Log Message:
remove obsolete files and directories
--- dbtcgiadmin.h DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:24 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:24 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/console/cmdln
Makefile, 1.6, NONE admconfig, 1.6, NONE admconfig_testscript,
1.2, NONE admconfig_testscript.bat, 1.3, NONE testinput,
1.1.1.1, NONE
Message-ID: <200707182210.l6IMAOuP028573@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/console/cmdln
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/console/cmdln
Removed Files:
Makefile admconfig admconfig_testscript
admconfig_testscript.bat testinput
Log Message:
remove obsolete files and directories
--- Makefile DELETED ---
--- admconfig DELETED ---
--- admconfig_testscript DELETED ---
--- admconfig_testscript.bat DELETED ---
--- testinput DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:24 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:24 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/html Makefile, 1.7,
NONE
Message-ID: <200707182210.l6IMAPeB028588@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/html
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/html
Removed Files:
Makefile
Log Message:
remove obsolete files and directories
--- Makefile DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:26 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:26 -0400
Subject: [Fedora-directory-commits]
adminserver/admserv/icons40 Makefile, 1.5, NONE
Message-ID: <200707182210.l6IMAQeg028613@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/icons40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/icons40
Removed Files:
Makefile
Log Message:
remove obsolete files and directories
--- Makefile DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:26 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:26 -0400
Subject: [Fedora-directory-commits]
adminserver/admserv/schema/ldif Makefile, 1.6, NONE
Message-ID: <200707182210.l6IMAQZv028630@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/schema/ldif
Removed Files:
Makefile
Log Message:
remove obsolete files and directories
--- Makefile DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:26 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:26 -0400
Subject: [Fedora-directory-commits]
adminserver/admserv/src dbtadmserv.h, 1.3, NONE
Message-ID: <200707182210.l6IMAQVg028646@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/src
Removed Files:
dbtadmserv.h
Log Message:
remove obsolete files and directories
--- dbtadmserv.h DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:27 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:27 -0400
Subject: [Fedora-directory-commits] adminserver/base LICENSE.TXT, 1.4,
NONE Makefile, 1.18, NONE base.inf, 1.6, NONE fixPI.pl, 1.3,
NONE svrcore.inf, 1.5, NONE
Message-ID: <200707182210.l6IMAR7A028653@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/base
Removed Files:
LICENSE.TXT Makefile base.inf fixPI.pl svrcore.inf
Log Message:
remove obsolete files and directories
--- LICENSE.TXT DELETED ---
--- Makefile DELETED ---
--- base.inf DELETED ---
--- fixPI.pl DELETED ---
--- svrcore.inf DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:28 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:28 -0400
Subject: [Fedora-directory-commits] adminserver/base/nt Makefile, 1.8,
NONE base.inf, 1.6, NONE fixPI.pl, 1.3, NONE insbase.c, 1.4,
NONE insbase.h, 1.3, NONE insbase.rc, 1.1.1.1, NONE resource.h,
1.1.1.1, NONE wizard.bmp, 1.1.1.1, NONE
Message-ID: <200707182210.l6IMASf4028671@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/base/nt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/base/nt
Removed Files:
Makefile base.inf fixPI.pl insbase.c insbase.h insbase.rc
resource.h wizard.bmp
Log Message:
remove obsolete files and directories
--- Makefile DELETED ---
--- base.inf DELETED ---
--- fixPI.pl DELETED ---
--- insbase.c DELETED ---
--- insbase.h DELETED ---
--- insbase.rc DELETED ---
--- resource.h DELETED ---
--- wizard.bmp DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:28 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:28 -0400
Subject: [Fedora-directory-commits] adminserver/i18npkg/apollo AdjustInf.pl,
1.3, NONE CheckInfZip.pl, 1.3, NONE GetL10nFiles.pl, 1.3,
NONE LocaleToLocale.pl, 1.3, NONE MakeL10nPkg.pl, 1.3,
NONE Makefile, 1.5, NONE PackageL10n.pl, 1.3,
NONE UnpackageL10n.pl, 1.3, NONE htmlsplit.rules, 1.2,
NONE server.flt, 1.6, NONE
Message-ID: <200707182210.l6IMASDk028690@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/i18npkg/apollo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/i18npkg/apollo
Removed Files:
AdjustInf.pl CheckInfZip.pl GetL10nFiles.pl LocaleToLocale.pl
MakeL10nPkg.pl Makefile PackageL10n.pl UnpackageL10n.pl
htmlsplit.rules server.flt
Log Message:
remove obsolete files and directories
--- AdjustInf.pl DELETED ---
--- CheckInfZip.pl DELETED ---
--- GetL10nFiles.pl DELETED ---
--- LocaleToLocale.pl DELETED ---
--- MakeL10nPkg.pl DELETED ---
--- Makefile DELETED ---
--- PackageL10n.pl DELETED ---
--- UnpackageL10n.pl DELETED ---
--- htmlsplit.rules DELETED ---
--- server.flt DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:28 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:28 -0400
Subject: [Fedora-directory-commits] adminserver/include/base Makefile, 1.5,
NONE
Message-ID: <200707182210.l6IMATK9028701@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/include/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/include/base
Removed Files:
Makefile
Log Message:
remove obsolete files and directories
--- Makefile DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:30 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:30 -0400
Subject: [Fedora-directory-commits]
adminserver/include/ldaputil cert.h, 1.3,
NONE certmap.h, 1.3, NONE dbconf.h, 1.3, NONE encode.h, 1.3,
NONE errors.h, 1.3, NONE extcmap.h, 1.3, NONE init.h, 1.3,
NONE ldapauth.h, 1.3, NONE ldaputil.h, 1.3, NONE
Message-ID: <200707182210.l6IMAUe7028717@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/include/ldaputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/include/ldaputil
Removed Files:
cert.h certmap.h dbconf.h encode.h errors.h extcmap.h init.h
ldapauth.h ldaputil.h
Log Message:
remove obsolete files and directories
--- cert.h DELETED ---
--- certmap.h DELETED ---
--- dbconf.h DELETED ---
--- encode.h DELETED ---
--- errors.h DELETED ---
--- extcmap.h DELETED ---
--- init.h DELETED ---
--- ldapauth.h DELETED ---
--- ldaputil.h DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:30 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:30 -0400
Subject: [Fedora-directory-commits]
adminserver/include/public Makefile, 1.6, NONE
Message-ID: <200707182210.l6IMAUaT028733@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/include/public
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/include/public
Removed Files:
Makefile
Log Message:
remove obsolete files and directories
--- Makefile DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:30 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:30 -0400
Subject: [Fedora-directory-commits]
adminserver/include/public/base Makefile, 1.5, NONE
Message-ID: <200707182210.l6IMAUGe028749@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/include/public/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/include/public/base
Removed Files:
Makefile
Log Message:
remove obsolete files and directories
--- Makefile DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:31 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:31 -0400
Subject: [Fedora-directory-commits] adminserver/lib/base Makefile,1.9,NONE
Message-ID: <200707182210.l6IMAVvj028777@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/lib/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/lib/base
Removed Files:
Makefile
Log Message:
remove obsolete files and directories
--- Makefile DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:32 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:32 -0400
Subject: [Fedora-directory-commits] adminserver/lib/ldaputil Makefile, 1.6,
NONE cert.c, 1.3, NONE certmap.c, 1.5, NONE certmap.conf, 1.2,
NONE dbconf.c, 1.3, NONE encode.c, 1.3, NONE errors.c, 1.3,
NONE init.c, 1.5, NONE ldapauth.c, 1.4, NONE ldapdb.c, 1.3,
NONE ldapu-changes.html, 1.2, NONE
Message-ID: <200707182210.l6IMAWP7028789@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/lib/ldaputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/lib/ldaputil
Removed Files:
Makefile cert.c certmap.c certmap.conf dbconf.c encode.c
errors.c init.c ldapauth.c ldapdb.c ldapu-changes.html
Log Message:
remove obsolete files and directories
--- Makefile DELETED ---
--- cert.c DELETED ---
--- certmap.c DELETED ---
--- certmap.conf DELETED ---
--- dbconf.c DELETED ---
--- encode.c DELETED ---
--- errors.c DELETED ---
--- init.c DELETED ---
--- ldapauth.c DELETED ---
--- ldapdb.c DELETED ---
--- ldapu-changes.html DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:32 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:32 -0400
Subject: [Fedora-directory-commits] adminserver/lib/ldaputil/examples
Certmap.mak, 1.3, NONE Makefile, 1.3, NONE README, 1.1.1.1,
NONE init.c, 1.3, NONE plugin.c, 1.3, NONE plugin.h, 1.3, NONE
Message-ID: <200707182210.l6IMAWYn028794@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/lib/ldaputil/examples
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/lib/ldaputil/examples
Removed Files:
Certmap.mak Makefile README init.c plugin.c plugin.h
Log Message:
remove obsolete files and directories
--- Certmap.mak DELETED ---
--- Makefile DELETED ---
--- README DELETED ---
--- init.c DELETED ---
--- plugin.c DELETED ---
--- plugin.h DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:33 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:33 -0400
Subject: [Fedora-directory-commits] adminserver/lib/libadmin Makefile, 1.7,
NONE
Message-ID: <200707182210.l6IMAXiE028804@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/lib/libadmin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/lib/libadmin
Removed Files:
Makefile
Log Message:
remove obsolete files and directories
--- Makefile DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:32 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:32 -0400
Subject: [Fedora-directory-commits] adminserver/lib/ldaputil/utest Makefile,
1.4, NONE auth.cpp, 1.4, NONE authtest, 1.4, NONE certmap.conf,
1.4, NONE dblist.conf, 1.1.1.1, NONE example.c, 1.3,
NONE plugin.c, 1.3, NONE plugin.h, 1.3, NONE stubs.c, 1.4,
NONE stubs.cpp, 1.4, NONE test.ref, 1.3, NONE
Message-ID: <200707182210.l6IMAWYT028799@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/lib/ldaputil/utest
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/lib/ldaputil/utest
Removed Files:
Makefile auth.cpp authtest certmap.conf dblist.conf example.c
plugin.c plugin.h stubs.c stubs.cpp test.ref
Log Message:
remove obsolete files and directories
--- Makefile DELETED ---
--- auth.cpp DELETED ---
--- authtest DELETED ---
--- certmap.conf DELETED ---
--- dblist.conf DELETED ---
--- example.c DELETED ---
--- plugin.c DELETED ---
--- plugin.h DELETED ---
--- stubs.c DELETED ---
--- stubs.cpp DELETED ---
--- test.ref DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:34 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:34 -0400
Subject: [Fedora-directory-commits]
adminserver/lib/libsi18n gsadmserv.h, 1.5, 1.6 Makefile, 1.8, NONE
Message-ID: <200707182210.l6IMAY6V028810@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/lib/libsi18n
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/lib/libsi18n
Modified Files:
gsadmserv.h
Removed Files:
Makefile
Log Message:
remove obsolete files and directories
Index: gsadmserv.h
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libsi18n/gsadmserv.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gsadmserv.h 10 Oct 2006 19:56:30 -0000 1.5
+++ gsadmserv.h 18 Jul 2007 22:10:31 -0000 1.6
@@ -24,9 +24,7 @@
#ifdef RESOURCE_STR
#undef LIBRARY_NAME
-#include "../admserv/src/dbtadmserv.h"
-#undef LIBRARY_NAME
-#include "../admserv/cgi-src/dbtcgiadmin.h"
+#include "../admserv/cgi-src40/dbtcgiadmin.h"
#undef LIBRARY_NAME
#include "base/dbtbase.h"
#undef LIBRARY_NAME
--- Makefile DELETED ---
From fedora-directory-commits at redhat.com Wed Jul 18 22:10:24 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:10:24 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40
dbtcgiadmin.h, NONE, 1.1 dsconfig.c, 1.8, 1.9 ugdsconfig.c, 1.8, 1.9
Message-ID: <200707182210.l6IMAO5b028558@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28451/adminserver/admserv/cgi-src40
Modified Files:
dsconfig.c ugdsconfig.c
Added Files:
dbtcgiadmin.h
Log Message:
remove obsolete files and directories
--- NEW FILE dbtcgiadmin.h ---
/** BEGIN COPYRIGHT BLOCK
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* END COPYRIGHT BLOCK **/
#define LIBRARY_NAME "cgiadmin"
static char dbtcgiadminid[] = "$DBT: cgiadmin referenced v1 $";
#include "i18n.h"
BEGIN_STR(cgiadmin)
ResDef( DBT_LibraryID_, -1, dbtcgiadminid )/* extracted from dbtcgiadmin.h*/
ResDef( DBT_missingRequestMethod_, 1, "Missing REQUEST_METHOD" )/*extracted from cladd.c*/
ResDef( DBT_thisShouldOnlyBeInvokedAsCgiProg_, 2, "This should only be invoked as CGI program" )/*extracted from cladd.c*/
ResDef( DBT_missingAdmservRoot_, 3, "Missing ADMSERV_ROOT" )/*extracted from cladd.c*/
ResDef( DBT_thisShouldOnlyBeInvokedAsCgiProg_1, 4, "This should only be invoked as CGI program" )/*extracted from cladd.c*/
ResDef( DBT_unrecognizedRequestType_, 5, "Unrecognized request type." )/*extracted from cladd.c*/
ResDef( DBT_startup_, 6, "Startup" )/*extracted from cladd.c*/
ResDef( DBT_failedToInitializeWinsock_, 7, "Failed to initialize WinSock" )/*extracted from cladd.c*/
ResDef( DBT_badFile_, 8, "Bad file" )/*extracted from cladd.c*/
ResDef( DBT_expectedServersLst_, 9, "Expected servers.lst" )/*extracted from cladd.c*/
ResDef( DBT_clusterMergeProductLstFromS_, 10, "Cluster: merge product.lst from %s" )/*extracted from cladd.c*/
ResDef( DBT_IObtainingProductInformationFrom_, 11, "Obtaining product information from %s://%s:%d
\n" )/*extracted from cladd.c*/
ResDef( DBT_updatedSBrN_, 12, "Updated %s
\n" )/*extracted from cladd.c*/
ResDef( DBT_badFile_1, 13, "Bad file" )/*extracted from cladd.c*/
ResDef( DBT_expectedServersInstanceLst_, 14, "Expected servers-instance.lst" )/*extracted from cladd.c*/
ResDef( DBT_warningSAlreadyExistsInformation_, 15, "Warning: %s already exists, information not added
\n" )/*extracted from cladd.c*/
ResDef( DBT_errorFailedToCreateFileSBrN_, 16, "Error: failed to create file %s
\n" )/*extracted from cladd.c*/
ResDef( DBT_warningDirectorySWillBeRemovedBe_, 17, "Warning: directory %s will be removed because of above error
\n" )/*extracted from cladd.c*/
ResDef( DBT_errorSSErrnoDBrN_, 19, "Error: %s %s (errno = %d)
\n" )/*extracted from cladd.c*/
ResDef( DBT_errorSSSBrN_, 20, "Error: %s %s, %s
\n" )/*extracted from cladd.c*/
ResDef( DBT_allowAllOperations_, 21, "ALLOW ALL OPERATIONS" )/*extracted from snmpcomm.c*/
ResDef( DBT_allowGetOperations_, 22, "ALLOW GET OPERATIONS" )/*extracted from snmpcomm.c*/
ResDef( DBT_allowSetOperations_, 23, "ALLOW SET OPERATIONS" )/*extracted from snmpcomm.c*/
ResDef( DBT_youAccessedThisFormWithAnInvalid_, 24, "You accessed this form with an invalid query string." )/*extracted from snmpcomm.c*/
ResDef( DBT_communityHasBeenRemoved_, 25, "community has been removed." )/*extracted from snmpcomm.c*/
ResDef( DBT_communityStrings_, 26, "Community Strings" )/*extracted from snmpcomm.c*/
ResDef( DBT_editACommunity_, 27, "Edit a Community" )/*extracted from snmpcomm.c*/
ResDef( DBT_addAnotherCommunity_, 28, "Add Another Community" )/*extracted from snmpcomm.c*/
ResDef( DBT_edit_, 30, "Edit" )/*extracted from snmpcomm.c*/
ResDef( DBT_remove_, 31, "Remove" )/*extracted from snmpcomm.c*/
ResDef( DBT_doYouReallyWantToRemoveThisEntry_, 32, "Do you really want to remove this entry?" )/*extracted from snmpcomm.c*/
ResDef( DBT_BCommunityBSN_, 33, "Community: %s\n" )/*extracted from snmpcomm.c*/
ResDef( DBT_BrBOperationBSN_, 34, "
Operation: %s\n" )/*extracted from snmpcomm.c*/
ResDef( DBT_noCommunitiesExist_, 35, "No communities exist." )/*extracted from snmpcomm.c*/
ResDef( DBT_youShouldEnterACommunityString_, 36, "You should enter a community string." )/*extracted from snmpcomm.c*/
ResDef( DBT_youShouldEnterOperationYouWantFo_, 37, "You should enter operation you want for this community." )/*extracted from snmpcomm.c*/
ResDef( DBT_theCommunityEntryHasBeenChanged_, 38, "the community entry has been changed" )/*extracted from snmpcomm.c*/
ResDef( DBT_SHasBeenAdded_, 39, "%s has been added" )/*extracted from snmpcomm.c*/
ResDef( DBT_failsToStartUpMasterAgent_, 40, "fails to start up master agent" )/*extracted from snmpcomm.c*/
ResDef( DBT_pleaseReferToDocumentsToStartIt_, 41, "Please refer to documents to start it" )/*extracted from snmpcomm.c*/
ResDef( DBT_masterAgentStartUp_, 42, "master agent start up" )/*extracted from snmpcomm.c*/
ResDef( DBT_canTOpenConfigFile_, 43, "can't open config file" )/*extracted from snmpcomm.c*/
ResDef( DBT_openTempFileFails_, 44, "open temp file fails" )/*extracted from snmpcomm.c*/
ResDef( DBT_openConfigFails_, 45, "open CONFIG fails" )/*extracted from snmpcomm.c*/
ResDef( DBT_openConfigFails_1, 46, "open CONFIG fails" )/*extracted from snmpcomm.c*/
ResDef( DBT_noPermissionToStartMasterAgent_, 47, "No permission to start master agent" )/*extracted from snmpcomm.c*/
ResDef( DBT_youMustBeRunningAsSuperUserPleas_, 48, "You must be running as super user. Please refer to documents" )/*extracted from snmpcomm.c*/
ResDef( DBT_canTGetTcpProtocolEntryN_, 49, "can't get tcp protocol entry\n" )/*extracted from snmpcomm.c*/
ResDef( DBT_canTCreateASockect_, 50, "can't create a sockect" )/*extracted from snmpcomm.c*/
ResDef( DBT_pleaseReferToDocumentsForItsConf_, 51, "Please refer to documents for its configuration" )/*extracted from snmpcomm.c*/
ResDef( DBT_aSmuxMasterAgentIsRunningOrTheSm_, 52, "a smux master agent is running or the smux port is not free yet" )/*extracted from snmpcomm.c*/
ResDef( DBT_pleaseReferToDocumentsForItsConf_1, 53, "Please refer to documents for its configuration" )/*extracted from snmpcomm.c*/
ResDef( DBT_canTGetUdpProtocolEntryN_, 54, "can't get udp protocol entry\n" )/*extracted from snmpcomm.c*/
ResDef( DBT_canTCreateASocket_, 55, "can't create a socket" )/*extracted from snmpcomm.c*/
ResDef( DBT_pleaseReferToDocumentsForItsConf_2, 56, "Please refer to documents for its configuration" )/*extracted from snmpcomm.c*/
ResDef( DBT_aSnmpdIsRunningOrSnmpPortIsNotFr_, 57, "a snmpd is running or snmp port is not free yet" )/*extracted from snmpcomm.c*/
ResDef( DBT_pleaseReferToDocumentsForItsConf_3, 58, "Please refer to documents for its configuration" )/*extracted from snmpcomm.c*/
ResDef( DBT_canTGetUdpProtocolEntryN_1, 59, "can't get udp protocol entry\n" )/*extracted from snmpcomm.c*/
ResDef( DBT_canTCreateASocket_1, 60, "can't create a socket" )/*extracted from snmpcomm.c*/
ResDef( DBT_pleaseReferToDocumentsForItsConf_4, 61, "Please refer to documents for its configuration" )/*extracted from snmpcomm.c*/
ResDef( DBT_failToStart_, 62, "Fail to start" )/*extracted from snmpcomm.c*/
ResDef( DBT_pleaseReferToDocumentsForItsConf_5, 63, "Please refer to documents for its configuration" )/*extracted from snmpcomm.c*/
END_STR(cgiadmin)
Index: dsconfig.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/dsconfig.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dsconfig.c 11 May 2007 19:44:05 -0000 1.8
+++ dsconfig.c 18 Jul 2007 22:10:22 -0000 1.9
@@ -44,10 +44,6 @@
#include "libadmin/libadmin.h"
#include "string.h"
-#include "ldaputil/errors.h"
-#include "ldaputil/ldaputil.h"
-#include "ldaputil/dbconf.h"
-
#include "libadminutil/resource.h"
#include "libadminutil/admutil.h"
#include "libadminutil/distadm.h"
Index: ugdsconfig.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ugdsconfig.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ugdsconfig.c 11 May 2007 19:44:05 -0000 1.8
+++ ugdsconfig.c 18 Jul 2007 22:10:22 -0000 1.9
@@ -50,10 +50,6 @@
#include "libadmin/libadmin.h"
#include "string.h"
-#include "ldaputil/errors.h"
-#include "ldaputil/ldaputil.h"
-#include "ldaputil/dbconf.h"
-
#include "libadminutil/admutil.h"
#include "libadminutil/resource.h"
#include "libadminutil/admutil.h"
From fedora-directory-commits at redhat.com Wed Jul 18 22:12:51 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 18:12:51 -0400
Subject: [Fedora-directory-commits] adminserver dirver.pl,1.3,NONE
Message-ID: <200707182212.l6IMCpDg028851@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28836
Removed Files:
dirver.pl
Log Message:
remove obsolete files
--- dirver.pl DELETED ---
From fedora-directory-commits at redhat.com Thu Jul 19 00:23:43 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 18 Jul 2007 20:23:43 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
Util.pm.in, 1.9, 1.10
Message-ID: <200707190023.l6J0Nh23017414@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17397
Modified Files:
Util.pm.in
Log Message:
Resolves: bug 248820
Bug Description: quick install failed when login userid doesn't match install user's id
Reviewed by: me
Fix Description: getlogin returns the _login_ ID which is the initial login id (from utmp). We want the username of the effective user ID, so I just needed to change getLogin to do that.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: Util.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Util.pm.in 13 Jul 2007 19:51:48 -0000 1.9
+++ Util.pm.in 19 Jul 2007 00:23:40 -0000 1.10
@@ -111,8 +111,11 @@
return $servid =~ /^[$validchars]+$/o;
}
+# we want the name of the effective user id of this process e.g. if someone did
+# an su root, we want getLogin to return "root" not the originating id (getlogin)
+# in perl, $> is the effective numeric user id - we need to turn it into a string
sub getLogin {
- return getlogin || (getpwuid($>))[0] || $ENV{USER} || die "Error: could not determine the current user ID: $!";
+ return (getpwuid($>))[0] || $ENV{USER} || die "Error: could not determine the current user ID: $!";
}
sub isValidUser {
From fedora-directory-commits at redhat.com Fri Jul 20 21:29:27 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 20 Jul 2007 17:29:27 -0400
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.50,
1.51 aclocal.m4, 1.42, 1.43 configure, 1.53, 1.54 missing,
1.32, 1.33 install-sh, 1.32, 1.33 depcomp, 1.32, 1.33 compile,
1.32, 1.33 Makefile.in, 1.59, 1.60 config.sub, 1.31,
1.32 config.guess, 1.31, 1.32
Message-ID: <200707202129.l6KLTRDr018159@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18120/ldapserver
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh depcomp
compile Makefile.in config.sub config.guess
Log Message:
move setup-ds.pl and migrate-ds.pl to sbindir
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Makefile.am 18 Jul 2007 20:37:07 -0000 1.50
+++ Makefile.am 20 Jul 2007 21:29:24 -0000 1.51
@@ -178,6 +178,9 @@
$(srcdir)/ldap/schema/60pam-plugin.ldif \
$(srcdir)/ldap/schema/99user.ldif
+sbin_SCRIPTS = ldap/admin/src/scripts/setup-ds.pl \
+ ldap/admin/src/scripts/migrate-ds.pl
+
bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
wrappers/dbscan \
wrappers/dsktune \
@@ -193,9 +196,7 @@
wrappers/cl-dump \
ldap/admin/src/scripts/cl-dump.pl \
wrappers/repl-monitor \
- ldap/admin/src/scripts/repl-monitor.pl \
- ldap/admin/src/scripts/setup-ds.pl \
- ldap/admin/src/scripts/migrate-ds.pl
+ ldap/admin/src/scripts/repl-monitor.pl
perl_SCRIPTS = ldap/admin/src/scripts/SetupLog.pm \
ldap/admin/src/scripts/Resource.pm \
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- Makefile.in 18 Jul 2007 20:37:08 -0000 1.59
+++ Makefile.in 20 Jul 2007 21:29:25 -0000 1.60
@@ -94,10 +94,10 @@
"$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(initdir)" "$(DESTDIR)$(perldir)" \
- "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" \
- "$(DESTDIR)$(infdir)" "$(DESTDIR)$(propertydir)" \
- "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" \
- "$(DESTDIR)$(schemadir)"
+ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" \
+ "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" \
+ "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" \
+ "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"
serverLTLIBRARIES_INSTALL = $(INSTALL)
serverpluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
@@ -688,9 +688,10 @@
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
initSCRIPT_INSTALL = $(INSTALL_SCRIPT)
perlSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
taskSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS) $(init_SCRIPTS) $(perl_SCRIPTS) \
- $(task_SCRIPTS)
+ $(sbin_SCRIPTS) $(task_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -1085,6 +1086,9 @@
$(srcdir)/ldap/schema/60pam-plugin.ldif \
$(srcdir)/ldap/schema/99user.ldif
+sbin_SCRIPTS = ldap/admin/src/scripts/setup-ds.pl \
+ ldap/admin/src/scripts/migrate-ds.pl
+
bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
wrappers/dbscan \
wrappers/dsktune \
@@ -1100,9 +1104,7 @@
wrappers/cl-dump \
ldap/admin/src/scripts/cl-dump.pl \
wrappers/repl-monitor \
- ldap/admin/src/scripts/repl-monitor.pl \
- ldap/admin/src/scripts/setup-ds.pl \
- ldap/admin/src/scripts/migrate-ds.pl
+ ldap/admin/src/scripts/repl-monitor.pl
perl_SCRIPTS = ldap/admin/src/scripts/SetupLog.pm \
ldap/admin/src/scripts/Resource.pm \
@@ -3745,6 +3747,25 @@
echo " rm -f '$(DESTDIR)$(perldir)/$$f'"; \
rm -f "$(DESTDIR)$(perldir)/$$f"; \
done
+install-sbinSCRIPTS: $(sbin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+ @list='$(sbin_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(sbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+ $(sbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(sbindir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-sbinSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(sbin_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(sbindir)/$$f"; \
+ done
install-taskSCRIPTS: $(task_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(taskdir)" || $(mkdir_p) "$(DESTDIR)$(taskdir)"
@@ -8831,7 +8852,7 @@
all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
$(DATA) config.h
installdirs:
- for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
+ for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -8963,7 +8984,7 @@
install-taskSCRIPTS
install-exec-am: install-binPROGRAMS install-binSCRIPTS \
- install-sbinPROGRAMS
+ install-sbinPROGRAMS install-sbinSCRIPTS
install-info: install-info-am
@@ -8996,8 +9017,9 @@
uninstall-initSCRIPTS uninstall-nodist_propertyDATA \
uninstall-perlSCRIPTS uninstall-propertyDATA \
uninstall-sampledataDATA uninstall-sbinPROGRAMS \
- uninstall-schemaDATA uninstall-serverLTLIBRARIES \
- uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS
+ uninstall-sbinSCRIPTS uninstall-schemaDATA \
+ uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
+ uninstall-taskSCRIPTS
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic clean-libtool \
@@ -9013,7 +9035,8 @@
install-infDATA install-info install-info-am \
install-initSCRIPTS install-man install-nodist_propertyDATA \
install-perlSCRIPTS install-propertyDATA \
- install-sampledataDATA install-sbinPROGRAMS install-schemaDATA \
+ install-sampledataDATA install-sbinPROGRAMS \
+ install-sbinSCRIPTS install-schemaDATA \
install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
install-strip install-taskSCRIPTS installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
@@ -9024,8 +9047,9 @@
uninstall-initSCRIPTS uninstall-nodist_propertyDATA \
uninstall-perlSCRIPTS uninstall-propertyDATA \
uninstall-sampledataDATA uninstall-sbinPROGRAMS \
- uninstall-schemaDATA uninstall-serverLTLIBRARIES \
- uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS
+ uninstall-sbinSCRIPTS uninstall-schemaDATA \
+ uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
+ uninstall-taskSCRIPTS
dirver.h: Makefile
From fedora-directory-commits at redhat.com Mon Jul 23 22:03:47 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 23 Jul 2007 18:03:47 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/ldif commonTasks.ldif,
1.5, NONE roledit.ldif, 1.7, NONE tasks.ldif, 1.8, NONE
Message-ID: <200707232203.l6NM3lRl004525@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/ldapserver/ldap/ldif
Removed Files:
commonTasks.ldif roledit.ldif tasks.ldif
Log Message:
removed more obsolete files
--- commonTasks.ldif DELETED ---
--- roledit.ldif DELETED ---
--- tasks.ldif DELETED ---
From fedora-directory-commits at redhat.com Mon Jul 23 22:03:47 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 23 Jul 2007 18:03:47 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/schema
ns-calendar-globopt.conf, 1.6,
NONE ns-certificate-globopt.conf, 1.4,
NONE ns-compass-globopt.conf, 1.6,
NONE ns-directory-globopt.conf, 1.6, NONE ns-mail-globopt.conf,
1.6, NONE ns-mcd-li-globopt.conf, 1.4,
NONE ns-media-globopt.conf, 1.6, NONE ns-news-globopt.conf,
1.4, NONE ns-proxy-globopt.conf, 1.6,
NONE ns-wcal-globopt.conf, 1.6, NONE ns-web-globopt.conf, 1.6, NONE
Message-ID: <200707232203.l6NM3lZn004530@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/schema
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/ldapserver/ldap/schema
Removed Files:
ns-calendar-globopt.conf ns-certificate-globopt.conf
ns-compass-globopt.conf ns-directory-globopt.conf
ns-mail-globopt.conf ns-mcd-li-globopt.conf
ns-media-globopt.conf ns-news-globopt.conf
ns-proxy-globopt.conf ns-wcal-globopt.conf ns-web-globopt.conf
Log Message:
removed more obsolete files
--- ns-calendar-globopt.conf DELETED ---
--- ns-certificate-globopt.conf DELETED ---
--- ns-compass-globopt.conf DELETED ---
--- ns-directory-globopt.conf DELETED ---
--- ns-mail-globopt.conf DELETED ---
--- ns-mcd-li-globopt.conf DELETED ---
--- ns-media-globopt.conf DELETED ---
--- ns-news-globopt.conf DELETED ---
--- ns-proxy-globopt.conf DELETED ---
--- ns-wcal-globopt.conf DELETED ---
--- ns-web-globopt.conf DELETED ---
From fedora-directory-commits at redhat.com Mon Jul 23 22:03:47 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 23 Jul 2007 18:03:47 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/dna
dna.ldif, 1.1, NONE
Message-ID: <200707232203.l6NM3lSK004536@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/dna
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/ldapserver/ldap/servers/plugins/dna
Removed Files:
dna.ldif
Log Message:
removed more obsolete files
--- dna.ldif DELETED ---
From fedora-directory-commits at redhat.com Mon Jul 23 22:03:49 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 23 Jul 2007 18:03:49 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/pam_passthru config.ldif, 1.5, NONE
Message-ID: <200707232203.l6NM3nWK004542@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/ldapserver/ldap/servers/plugins/pam_passthru
Removed Files:
config.ldif
Log Message:
removed more obsolete files
--- config.ldif DELETED ---
From fedora-directory-commits at redhat.com Mon Jul 23 22:03:46 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 23 Jul 2007 18:03:46 -0400
Subject: [Fedora-directory-commits] ldapserver/include netsite.h, 1.6,
1.7 version.h, 1.12, NONE
Message-ID: <200707232204.l6NM4GTd004558@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/ldapserver/include
Modified Files:
netsite.h
Removed Files:
version.h
Log Message:
removed more obsolete files
Index: netsite.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/netsite.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- netsite.h 10 Nov 2006 23:44:24 -0000 1.6
+++ netsite.h 23 Jul 2007 22:03:44 -0000 1.7
@@ -70,10 +70,6 @@
#define EXTERNC
#endif
-#ifndef VERSION_H
-#include "version.h"
-#endif /* !VERSION_H */
-
#ifndef BASE_SYSTEMS_H
#include "base/systems.h"
#endif /* !BASE_SYSTEMS_H */
--- version.h DELETED ---
From fedora-directory-commits at redhat.com Tue Jul 24 18:40:47 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 24 Jul 2007 14:40:47 -0400
Subject: [Fedora-directory-commits] adminutil configure.ac, 1.6,
1.7 aclocal.m4, 1.9, 1.10 configure, 1.9, 1.10 missing, 1.8,
1.9 install-sh, 1.8, 1.9 depcomp, 1.8, 1.9 compile, 1.8,
1.9 Makefile.in, 1.9, 1.10 config.sub, 1.8, 1.9 config.guess,
1.8, 1.9
Message-ID: <200707241840.l6OIelB1004310@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4261
Modified Files:
configure.ac aclocal.m4 configure missing install-sh depcomp
compile Makefile.in config.sub config.guess
Log Message:
bump version to 1.1.3
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminutil/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure.ac 22 Jun 2007 22:51:01 -0000 1.6
+++ configure.ac 24 Jul 2007 18:40:44 -0000 1.7
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([adminutil], [1.1.2], [http://bugzilla.redhat.com/])
+AC_INIT([adminutil], [1.1.3], [http://bugzilla.redhat.com/])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminutil/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure 22 Jun 2007 22:51:00 -0000 1.9
+++ configure 24 Jul 2007 18:40:44 -0000 1.10
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for adminutil 1.1.2.
+# Generated by GNU Autoconf 2.59 for adminutil 1.1.3.
#
# Report bugs to .
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='adminutil'
PACKAGE_TARNAME='adminutil'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='adminutil 1.1.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='adminutil 1.1.3'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -954,7 +954,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures adminutil 1.1.2 to adapt to many kinds of systems.
+\`configure' configures adminutil 1.1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of adminutil 1.1.2:";;
+ short | recursive ) echo "Configuration of adminutil 1.1.3:";;
esac
cat <<\_ACEOF
@@ -1180,7 +1180,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-adminutil configure 1.1.2
+adminutil configure 1.1.3
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1194,7 +1194,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by adminutil $as_me 1.1.2, which was
+It was created by adminutil $as_me 1.1.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1837,7 +1837,7 @@
# Define the identity of the package.
PACKAGE='adminutil'
- VERSION='1.1.2'
+ VERSION='1.1.3'
cat >>confdefs.h <<_ACEOF
@@ -24367,7 +24367,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by adminutil $as_me 1.1.2, which was
+This file was extended by adminutil $as_me 1.1.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24425,7 +24425,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-adminutil config.status 1.1.2
+adminutil config.status 1.1.3
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
From fedora-directory-commits at redhat.com Tue Jul 24 20:06:42 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 24 Jul 2007 16:06:42 -0400
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.51,
1.52 aclocal.m4, 1.43, 1.44 configure, 1.54, 1.55 missing,
1.33, 1.34 install-sh, 1.33, 1.34 depcomp, 1.33, 1.34 compile,
1.33, 1.34 Makefile.in, 1.60, 1.61 config.sub, 1.32,
1.33 config.guess, 1.32, 1.33
Message-ID: <200707242006.l6OK6g8k028163@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28126
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh depcomp
compile Makefile.in config.sub config.guess
Log Message:
forgot to tell Makefile.am about removed obsolete files
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Makefile.am 20 Jul 2007 21:29:24 -0000 1.51
+++ Makefile.am 24 Jul 2007 20:06:39 -0000 1.52
@@ -131,14 +131,11 @@
$(srcdir)/ldap/schema/slapd-collations.conf
sampledata_DATA = $(srcdir)/ldap/ldif/Ace.ldif \
- $(srcdir)/ldap/ldif/commonTasks.ldif \
$(srcdir)/ldap/ldif/European.ldif \
$(srcdir)/ldap/ldif/Eurosuffix.ldif \
$(srcdir)/ldap/ldif/Example.ldif \
$(srcdir)/ldap/ldif/Example-roles.ldif \
$(srcdir)/ldap/ldif/Example-views.ldif \
- $(srcdir)/ldap/ldif/roledit.ldif \
- $(srcdir)/ldap/ldif/tasks.ldif \
$(srcdir)/ldap/ldif/template.ldif \
ldap/ldif/template-dse.ldif \
ldap/ldif/template-suffix-db.ldif \
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Makefile.in 20 Jul 2007 21:29:25 -0000 1.60
+++ Makefile.in 24 Jul 2007 20:06:40 -0000 1.61
@@ -1039,14 +1039,11 @@
$(srcdir)/ldap/schema/slapd-collations.conf
sampledata_DATA = $(srcdir)/ldap/ldif/Ace.ldif \
- $(srcdir)/ldap/ldif/commonTasks.ldif \
$(srcdir)/ldap/ldif/European.ldif \
$(srcdir)/ldap/ldif/Eurosuffix.ldif \
$(srcdir)/ldap/ldif/Example.ldif \
$(srcdir)/ldap/ldif/Example-roles.ldif \
$(srcdir)/ldap/ldif/Example-views.ldif \
- $(srcdir)/ldap/ldif/roledit.ldif \
- $(srcdir)/ldap/ldif/tasks.ldif \
$(srcdir)/ldap/ldif/template.ldif \
ldap/ldif/template-dse.ldif \
ldap/ldif/template-suffix-db.ldif \
From fedora-directory-commits at redhat.com Tue Jul 24 20:10:17 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 24 Jul 2007 16:10:17 -0400
Subject: [Fedora-directory-commits] adminserver LICENSE,NONE,1.1
Message-ID: <200707242010.l6OKAHT0028637@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver
Added Files:
LICENSE
Log Message:
remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server
--- NEW FILE LICENSE ---
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
This Program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA.
From fedora-directory-commits at redhat.com Tue Jul 24 20:10:17 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 24 Jul 2007 16:10:17 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff mime.types,
1.4, NONE
Message-ID: <200707242010.l6OKAHOC028638@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/admserv/cfgstuff
Removed Files:
mime.types
Log Message:
remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server
--- mime.types DELETED ---
From fedora-directory-commits at redhat.com Tue Jul 24 20:10:18 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 24 Jul 2007 16:10:18 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/schema/ldif
adminglobal.ldif, 1.1, NONE admintasks.ldif, 1.2,
NONE readme.txt, 1.1.1.1, NONE
Message-ID: <200707242010.l6OKAIJl028699@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/admserv/schema/ldif
Removed Files:
adminglobal.ldif admintasks.ldif readme.txt
Log Message:
remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server
--- adminglobal.ldif DELETED ---
--- admintasks.ldif DELETED ---
--- readme.txt DELETED ---
From fedora-directory-commits at redhat.com Tue Jul 24 20:10:20 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 24 Jul 2007 16:10:20 -0400
Subject: [Fedora-directory-commits] adminserver/include netsite.h, 1.4,
1.5 version.h, 1.7, NONE
Message-ID: <200707242010.l6OKAKad028705@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/include
Modified Files:
netsite.h
Removed Files:
version.h
Log Message:
remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server
Index: netsite.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/netsite.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netsite.h 18 Aug 2005 19:14:21 -0000 1.4
+++ netsite.h 24 Jul 2007 20:10:16 -0000 1.5
@@ -48,78 +48,10 @@
#define EXTERNC
#endif
-#ifndef VERSION_H
-#include "version.h"
-#endif /* !VERSION_H */
-
#ifndef BASE_SYSTEMS_H
#include "base/systems.h"
#endif /* !BASE_SYSTEMS_H */
-#define MAGNUS_VENDER_NAME VI_COMPANYNAME
-
-#ifdef MCC_PROXY
-#define MAGNUS_VERSION PROXY_VERSION_DEF
-#define MAGNUS_VERSION_STRING PROXY_VERSION_STRING
-
-#elif defined(NS_CMS)
-#define MAGNUS_VERSION CMS_VERSION_DEF
-#define MAGNUS_VERSION_STRING CMS_VERSION_STRING
-
-#elif defined(NS_DS)
-#define MAGNUS_VERSION DS_VERSION_DEF
-#define MAGNUS_VERSION_STRING DS_VERSION_STRING
-
-#elif defined(MCC_ADMSERV)
-#define MAGNUS_VERSION ADMSERV_VERSION_DEF
-#define MAGNUS_VERSION_STRING ADMSERV_VERSION_STRING
-#define MAGNUS_SERVER_NAME ADMSERV_NAME
-
-#elif defined(NS_CATALOG)
-#define MAGNUS_VERSION CATALOG_VERSION_DEF
-#define MAGNUS_VERSION_STRING CATALOG_VERSION_STRING
-
-#elif defined(NS_RDS)
-#define MAGNUS_VERSION RDS_VERSION_DEF
-#define MAGNUS_VERSION_STRING RDS_VERSION_STRING
-
-#elif defined(MCC_HTTPD)
-
-#ifdef NS_PERSONAL
-#define MAGNUS_VERSION PERSONAL_VERSION_DEF
-#else
-#define MAGNUS_VERSION ENTERPRISE_VERSION_DEF
-#endif
-
-#if defined(XP_UNIX) || defined(USE_ADMSERV)
-#if defined(NS_DS)
-#define MAGNUS_VERSION_STRING DS_VERSION_STRING
-#elif defined(NS_PERSONAL)
-#define MAGNUS_VERSION_STRING PERSONAL_VERSION_STRING
-#elif defined(NS_CATALOG)
-#define MAGNUS_VERSION_STRING CATALOG_VERSION_STRING
-#elif defined(NS_RDS)
-#define MAGNUS_VERSION_STRING RDS_VERSION_STRING
-#elif defined(NS_CMS)
-#define MAGNUS_VERSION_STRING CMS_VERSION_STRING
-#else
-#define MAGNUS_VERSION_STRING ENTERPRISE_VERSION_STRING
-#endif
-#endif /* XP_UNIX */
-
-#elif defined(MCC_NEWS)
-#define MAGNUS_VERSION_STRING NEWS_VERSION_STRING
-
-#elif defined(NS_MAIL)
-#define MAGNUS_VERSION MAIL_VERSION_DEF
-#define MAGNUS_VERSION_STRING MAIL_VERSION_STRING
-
-#elif defined(MCC_BATMAN)
-#define MAGNUS_VERSION BATMAN_VERSION_DEF
-#define MAGNUS_VERSION_STRING BATMAN_VERSION_STRING
-
-#endif
-
#ifndef VOID
#define VOID void
#endif
--- version.h DELETED ---
From fedora-directory-commits at redhat.com Tue Jul 24 20:10:20 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 24 Jul 2007 16:10:20 -0400
Subject: [Fedora-directory-commits]
adminserver/include/libdsa dsalib.h, 1.3,
1.4 dsalib_pw.h, 1.1, 1.2 dsalib_schema.h, 1.1, 1.2
Message-ID: <200707242010.l6OKAKgW028713@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/include/libdsa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/include/libdsa
Modified Files:
dsalib.h dsalib_pw.h dsalib_schema.h
Log Message:
remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server
Index: dsalib.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/libdsa/dsalib.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dsalib.h 26 Jun 2007 18:34:47 -0000 1.3
+++ dsalib.h 24 Jul 2007 20:10:18 -0000 1.4
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: dsalib_pw.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/libdsa/dsalib_pw.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dsalib_pw.h 13 Jun 2007 01:37:17 -0000 1.1
+++ dsalib_pw.h 24 Jul 2007 20:10:18 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: dsalib_schema.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/libdsa/dsalib_schema.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dsalib_schema.h 13 Jun 2007 01:37:17 -0000 1.1
+++ dsalib_schema.h 24 Jul 2007 20:10:18 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
From fedora-directory-commits at redhat.com Tue Jul 24 20:10:20 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 24 Jul 2007 16:10:20 -0400
Subject: [Fedora-directory-commits]
adminserver/lib/libdsa dsalib_conf.c, 1.3,
1.4 dsalib_confs.c, 1.1, 1.2 dsalib_db.c, 1.3,
1.4 dsalib_debug.c, 1.1, 1.2 dsalib_dn.c, 1.1,
1.2 dsalib_filename.c, 1.1, 1.2 dsalib_ldif.c, 1.2,
1.3 dsalib_location.c, 1.3, 1.4 dsalib_pw.c, 1.1,
1.2 dsalib_tailf.c, 1.1, 1.2 dsalib_updown.c, 1.3,
1.4 dsalib_util.c, 1.1, 1.2
Message-ID: <200707242010.l6OKAKOW028721@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/lib/libdsa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/lib/libdsa
Modified Files:
dsalib_conf.c dsalib_confs.c dsalib_db.c dsalib_debug.c
dsalib_dn.c dsalib_filename.c dsalib_ldif.c dsalib_location.c
dsalib_pw.c dsalib_tailf.c dsalib_updown.c dsalib_util.c
Log Message:
remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server
Index: dsalib_conf.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_conf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dsalib_conf.c 26 Jun 2007 18:34:47 -0000 1.3
+++ dsalib_conf.c 24 Jul 2007 20:10:18 -0000 1.4
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: dsalib_confs.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_confs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dsalib_confs.c 13 Jun 2007 01:37:17 -0000 1.1
+++ dsalib_confs.c 24 Jul 2007 20:10:18 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: dsalib_db.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_db.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dsalib_db.c 26 Jun 2007 18:34:47 -0000 1.3
+++ dsalib_db.c 24 Jul 2007 20:10:18 -0000 1.4
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: dsalib_debug.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_debug.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dsalib_debug.c 13 Jun 2007 01:37:17 -0000 1.1
+++ dsalib_debug.c 24 Jul 2007 20:10:18 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: dsalib_dn.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_dn.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dsalib_dn.c 13 Jun 2007 01:37:17 -0000 1.1
+++ dsalib_dn.c 24 Jul 2007 20:10:18 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: dsalib_filename.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_filename.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dsalib_filename.c 13 Jun 2007 01:37:17 -0000 1.1
+++ dsalib_filename.c 24 Jul 2007 20:10:18 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: dsalib_ldif.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_ldif.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dsalib_ldif.c 26 Jun 2007 18:34:47 -0000 1.2
+++ dsalib_ldif.c 24 Jul 2007 20:10:18 -0000 1.3
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: dsalib_location.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_location.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dsalib_location.c 26 Jun 2007 18:34:47 -0000 1.3
+++ dsalib_location.c 24 Jul 2007 20:10:18 -0000 1.4
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: dsalib_pw.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_pw.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dsalib_pw.c 13 Jun 2007 01:37:17 -0000 1.1
+++ dsalib_pw.c 24 Jul 2007 20:10:18 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: dsalib_tailf.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_tailf.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dsalib_tailf.c 13 Jun 2007 01:37:17 -0000 1.1
+++ dsalib_tailf.c 24 Jul 2007 20:10:18 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: dsalib_updown.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_updown.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dsalib_updown.c 26 Jun 2007 18:34:47 -0000 1.3
+++ dsalib_updown.c 24 Jul 2007 20:10:18 -0000 1.4
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: dsalib_util.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_util.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dsalib_util.c 13 Jun 2007 01:37:17 -0000 1.1
+++ dsalib_util.c 24 Jul 2007 20:10:18 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
From fedora-directory-commits at redhat.com Tue Jul 24 20:10:17 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 24 Jul 2007 16:10:17 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-ds addindex.c,
1.1, 1.2 ds_bak2db.c, 1.1, 1.2 ds_db2bak.c, 1.1,
1.2 ds_db2ldif.c, 1.1, 1.2 ds_ldif2db.c, 1.1, 1.2 ds_listdb.c,
1.1, 1.2 ds_remove.c, 1.2, 1.3 ds_rmdb.c, 1.1,
1.2 ds_snmpctrl.c, 1.2, 1.3 init_ds_env.c, 1.1,
1.2 init_ds_env.h, 1.1, 1.2 restart.c, 1.1, 1.2 shutdown.c,
1.1, 1.2 start.c, 1.1, 1.2 vlvindex.c, 1.1, 1.2
Message-ID: <200707242010.l6OKAmjQ028761@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-ds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/admserv/cgi-ds
Modified Files:
addindex.c ds_bak2db.c ds_db2bak.c ds_db2ldif.c ds_ldif2db.c
ds_listdb.c ds_remove.c ds_rmdb.c ds_snmpctrl.c init_ds_env.c
init_ds_env.h restart.c shutdown.c start.c vlvindex.c
Log Message:
remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server
Index: addindex.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/addindex.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- addindex.c 13 Jun 2007 01:37:16 -0000 1.1
+++ addindex.c 24 Jul 2007 20:10:15 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: ds_bak2db.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_bak2db.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds_bak2db.c 13 Jun 2007 01:37:16 -0000 1.1
+++ ds_bak2db.c 24 Jul 2007 20:10:15 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: ds_db2bak.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_db2bak.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds_db2bak.c 13 Jun 2007 01:37:16 -0000 1.1
+++ ds_db2bak.c 24 Jul 2007 20:10:15 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: ds_db2ldif.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_db2ldif.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds_db2ldif.c 13 Jun 2007 01:37:16 -0000 1.1
+++ ds_db2ldif.c 24 Jul 2007 20:10:15 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: ds_ldif2db.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_ldif2db.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds_ldif2db.c 13 Jun 2007 01:37:16 -0000 1.1
+++ ds_ldif2db.c 24 Jul 2007 20:10:15 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: ds_listdb.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_listdb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds_listdb.c 13 Jun 2007 01:37:16 -0000 1.1
+++ ds_listdb.c 24 Jul 2007 20:10:15 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: ds_remove.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_remove.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ds_remove.c 26 Jun 2007 18:34:46 -0000 1.2
+++ ds_remove.c 24 Jul 2007 20:10:15 -0000 1.3
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: ds_rmdb.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_rmdb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds_rmdb.c 13 Jun 2007 01:37:16 -0000 1.1
+++ ds_rmdb.c 24 Jul 2007 20:10:15 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: ds_snmpctrl.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_snmpctrl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ds_snmpctrl.c 26 Jun 2007 18:34:46 -0000 1.2
+++ ds_snmpctrl.c 24 Jul 2007 20:10:15 -0000 1.3
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: init_ds_env.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/init_ds_env.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- init_ds_env.c 13 Jun 2007 01:37:16 -0000 1.1
+++ init_ds_env.c 24 Jul 2007 20:10:15 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: init_ds_env.h
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/init_ds_env.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- init_ds_env.h 13 Jun 2007 01:37:16 -0000 1.1
+++ init_ds_env.h 24 Jul 2007 20:10:15 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: restart.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/restart.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- restart.c 13 Jun 2007 01:37:16 -0000 1.1
+++ restart.c 24 Jul 2007 20:10:15 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: shutdown.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/shutdown.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shutdown.c 13 Jun 2007 01:37:16 -0000 1.1
+++ shutdown.c 24 Jul 2007 20:10:15 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: start.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/start.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- start.c 13 Jun 2007 01:37:16 -0000 1.1
+++ start.c 24 Jul 2007 20:10:15 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: vlvindex.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/vlvindex.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlvindex.c 13 Jun 2007 01:37:16 -0000 1.1
+++ vlvindex.c 24 Jul 2007 20:10:15 -0000 1.2
@@ -11,26 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
From fedora-directory-commits at redhat.com Tue Jul 24 20:10:18 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 24 Jul 2007 16:10:18 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40
ds_create.in, 1.3, 1.4 ds_remove.in, 1.2, 1.3
Message-ID: <200707242010.l6OKAmed028778@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/admserv/cgi-src40
Modified Files:
ds_create.in ds_remove.in
Log Message:
remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server
Index: ds_create.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_create.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ds_create.in 13 Jul 2007 18:39:15 -0000 1.3
+++ ds_create.in 24 Jul 2007 20:10:15 -0000 1.4
@@ -12,26 +12,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
Index: ds_remove.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_remove.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ds_remove.in 11 Jul 2007 21:36:47 -0000 1.2
+++ ds_remove.in 24 Jul 2007 20:10:15 -0000 1.3
@@ -12,26 +12,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
From fedora-directory-commits at redhat.com Tue Jul 24 20:10:18 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 24 Jul 2007 16:10:18 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
ASDialogs.pm.in, 1.5, 1.6 AdminMigration.pm.in, 1.2,
1.3 AdminServer.pm.in, 1.6, 1.7 AdminUtil.pm.in, 1.10,
1.11 ConfigDSDialogs.pm, 1.4, 1.5 adminserver.map.in, 1.6,
1.7 asmigrate.map.in, 1.1, 1.2 configdsroot.map.in, 1.5,
1.6 dirserver.map.in, 1.6, 1.7 migrate-ds-admin.pl.in, 1.5,
1.6 register_param.map.in, 1.7, 1.8 register_server.pl.in, 1.4,
1.5 setup-ds-admin.pl.in, 1.9, 1.10
Message-ID: <200707242010.l6OKAmNH028785@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/admserv/newinst/src
Modified Files:
ASDialogs.pm.in AdminMigration.pm.in AdminServer.pm.in
AdminUtil.pm.in ConfigDSDialogs.pm adminserver.map.in
asmigrate.map.in configdsroot.map.in dirserver.map.in
migrate-ds-admin.pl.in register_param.map.in
register_server.pl.in setup-ds-admin.pl.in
Log Message:
remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server
Index: ASDialogs.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ASDialogs.pm.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ASDialogs.pm.in 13 Jul 2007 19:53:17 -0000 1.5
+++ ASDialogs.pm.in 24 Jul 2007 20:10:16 -0000 1.6
@@ -11,26 +11,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
Index: AdminMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminMigration.pm.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AdminMigration.pm.in 4 Jul 2007 01:31:33 -0000 1.2
+++ AdminMigration.pm.in 24 Jul 2007 20:10:16 -0000 1.3
@@ -11,26 +11,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
Index: AdminServer.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminServer.pm.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AdminServer.pm.in 13 Jul 2007 18:39:15 -0000 1.6
+++ AdminServer.pm.in 24 Jul 2007 20:10:16 -0000 1.7
@@ -11,26 +11,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
Index: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AdminUtil.pm.in 13 Jul 2007 18:39:15 -0000 1.10
+++ AdminUtil.pm.in 24 Jul 2007 20:10:16 -0000 1.11
@@ -11,26 +11,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
Index: ConfigDSDialogs.pm
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ConfigDSDialogs.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConfigDSDialogs.pm 20 Jun 2007 16:35:02 -0000 1.4
+++ ConfigDSDialogs.pm 24 Jul 2007 20:10:16 -0000 1.5
@@ -11,26 +11,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
Index: adminserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/adminserver.map.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- adminserver.map.in 11 Jul 2007 01:20:21 -0000 1.6
+++ adminserver.map.in 24 Jul 2007 20:10:16 -0000 1.7
@@ -11,26 +11,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
Index: asmigrate.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/asmigrate.map.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- asmigrate.map.in 29 Jun 2007 21:29:05 -0000 1.1
+++ asmigrate.map.in 24 Jul 2007 20:10:16 -0000 1.2
@@ -11,26 +11,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
Index: configdsroot.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/configdsroot.map.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configdsroot.map.in 11 Jul 2007 01:20:21 -0000 1.5
+++ configdsroot.map.in 24 Jul 2007 20:10:16 -0000 1.6
@@ -11,26 +11,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
Index: dirserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/dirserver.map.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dirserver.map.in 11 Jul 2007 01:20:21 -0000 1.6
+++ dirserver.map.in 24 Jul 2007 20:10:16 -0000 1.7
@@ -11,26 +11,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
Index: migrate-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/migrate-ds-admin.pl.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- migrate-ds-admin.pl.in 18 Jul 2007 20:43:14 -0000 1.5
+++ migrate-ds-admin.pl.in 24 Jul 2007 20:10:16 -0000 1.6
@@ -12,26 +12,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
Index: register_param.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- register_param.map.in 11 Jul 2007 01:20:21 -0000 1.7
+++ register_param.map.in 24 Jul 2007 20:10:16 -0000 1.8
@@ -11,26 +11,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
Index: register_server.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_server.pl.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- register_server.pl.in 4 Jul 2007 01:31:33 -0000 1.4
+++ register_server.pl.in 24 Jul 2007 20:10:16 -0000 1.5
@@ -12,26 +12,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
Index: setup-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- setup-ds-admin.pl.in 18 Jul 2007 20:43:14 -0000 1.9
+++ setup-ds-admin.pl.in 24 Jul 2007 20:10:16 -0000 1.10
@@ -12,26 +12,6 @@
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
From fedora-directory-commits at redhat.com Wed Jul 25 15:20:03 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 25 Jul 2007 11:20:03 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/ldif
template-dse.ldif.in, 1.3, 1.4
Message-ID: <200707251520.l6PFK396004428@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4391/ldapserver/ldap/ldif
Modified Files:
template-dse.ldif.in
Log Message:
Resolves: bug 249470
Bug Description: cn equality index missing by default
Reviewed by: nhosoi (Thanks!)
Fix Description: When creating the database instance during dse.ldif processing, we do not create the user defined indexes from the defaults for this backend. This used to work in the old setup code because that code would always add the configuration for the indexes for the new instance. The way it is supposed to work is that a new instance should just copy the default indexes for that backend. This works fine when adding an instance via LDAP but not during startup. I just added a call to have this done during startup. I also removed some obsolete indexes from the default indexes.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: template-dse.ldif.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/ldif/template-dse.ldif.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-dse.ldif.in 13 Jul 2007 18:35:33 -0000 1.3
+++ template-dse.ldif.in 25 Jul 2007 15:20:01 -0000 1.4
@@ -603,22 +603,6 @@
nssystemindex: false
nsindextype: eq
-dn: cn=nsCalXItemId,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config
-objectclass: top
-objectclass: nsIndex
-cn: nsCalXItemId
-nssystemindex: false
-nsindextype: pres
-nsindextype: eq
-nsindextype: sub
-
-dn: cn=nsLIProfileName,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config
-objectclass: top
-objectclass: nsIndex
-cn: nsLIProfileName
-nssystemindex: false
-nsindextype: eq
-
dn: cn=nsUniqueId,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config
objectclass: top
objectclass: nsIndex
@@ -626,13 +610,6 @@
nssystemindex: true
nsindextype: eq
-dn: cn=nswcalCALID,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config
-objectclass: top
-objectclass: nsIndex
-cn: nswcalCALID
-nssystemindex: false
-nsindextype: eq
-
dn: cn=numsubordinates,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config
objectclass: top
objectclass: nsIndex
@@ -661,20 +638,6 @@
nssystemindex: true
nsindextype: eq
-dn: cn=pipstatus,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config
-objectclass: top
-objectclass: nsIndex
-cn: pipstatus
-nssystemindex: false
-nsindextype: eq
-
-dn: cn=pipuid,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config
-objectclass: top
-objectclass: nsIndex
-cn: pipuid
-nssystemindex: false
-nsindextype: pres
-
dn: cn=seeAlso,cn=default indexes, cn=config,cn=ldbm database,cn=plugins,cn=config
objectclass: top
objectclass: nsIndex
From fedora-directory-commits at redhat.com Wed Jul 25 15:20:03 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 25 Jul 2007 11:20:03 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm
ldbm_instance_config.c, 1.7, 1.8
Message-ID: <200707251520.l6PFK3e8004434@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4391/ldapserver/ldap/servers/slapd/back-ldbm
Modified Files:
ldbm_instance_config.c
Log Message:
Resolves: bug 249470
Bug Description: cn equality index missing by default
Reviewed by: nhosoi (Thanks!)
Fix Description: When creating the database instance during dse.ldif processing, we do not create the user defined indexes from the defaults for this backend. This used to work in the old setup code because that code would always add the configuration for the indexes for the new instance. The way it is supposed to work is that a new instance should just copy the default indexes for that backend. This works fine when adding an instance via LDAP but not during startup. I just added a call to have this done during startup. I also removed some obsolete indexes from the default indexes.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: ldbm_instance_config.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ldbm_instance_config.c 4 Dec 2006 18:36:57 -0000 1.7
+++ ldbm_instance_config.c 25 Jul 2007 15:20:01 -0000 1.8
@@ -837,6 +837,10 @@
if (pb == NULL) {
/* called during startup -- do the rest now */
rc = ldbm_instance_generate(li, instance_name, NULL);
+ if (!rc) {
+ inst = ldbm_instance_find_by_name(li, instance_name);
+ rc = ldbm_instance_create_default_user_indexes(inst);
+ }
}
/* if called during a normal ADD operation, the postadd callback
* will do the rest.
From fedora-directory-commits at redhat.com Wed Jul 25 15:41:19 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 25 Jul 2007 11:41:19 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/console
SplashScreen.java, 1.1.1.1, 1.2
Message-ID: <200707251541.l6PFfJ20008420@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8255/src/com/netscape/management/client/console
Modified Files:
SplashScreen.java
Log Message:
Resolves: 249484
Summary: Moved login splash screen image into the theme jar file.
Index: SplashScreen.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/SplashScreen.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- SplashScreen.java 18 Jul 2005 00:34:15 -0000 1.1.1.1
+++ SplashScreen.java 25 Jul 2007 15:41:16 -0000 1.2
@@ -134,7 +134,7 @@
GridBagConstraints c = new GridBagConstraints();
- JLabel splashLabel = new JLabel(new RemoteImage("com/netscape/management/client/console/images/login.gif"));
+ JLabel splashLabel = new JLabel(new RemoteImage("com/netscape/management/client/theme/images/login.gif"));
c.gridwidth = 1;
c.gridheight = 1;
c.gridx = 0;
From fedora-directory-commits at redhat.com Wed Jul 25 15:41:19 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 25 Jul 2007 11:41:19 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/console/images
login.gif, 1.1.1.1, NONE
Message-ID: <200707251541.l6PFfJpw008425@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/console/images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8255/src/com/netscape/management/client/console/images
Removed Files:
login.gif
Log Message:
Resolves: 249484
Summary: Moved login splash screen image into the theme jar file.
From fedora-directory-commits at redhat.com Wed Jul 25 15:41:19 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 25 Jul 2007 11:41:19 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/theme/images
login.gif, NONE, 1.1 OldServer.gif, 1.1, NONE
Message-ID: <200707251541.l6PFfJRk008431@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/theme/images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8255/src/com/netscape/management/client/theme/images
Added Files:
login.gif
Removed Files:
OldServer.gif
Log Message:
Resolves: 249484
Summary: Moved login splash screen image into the theme jar file.
From fedora-directory-commits at redhat.com Wed Jul 25 20:07:58 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed, 25 Jul 2007 16:07:58 -0400
Subject: [Fedora-directory-commits] esc/win32 - New directory
Message-ID: <200707252007.l6PK7wBK015006@cvs-int.fedora.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14991/win32
Log Message:
Directory /cvs/dirsec/esc/win32 added to the repository
From fedora-directory-commits at redhat.com Wed Jul 25 20:13:05 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed, 25 Jul 2007 16:13:05 -0400
Subject: [Fedora-directory-commits] esc/win32 build.sh, NONE,
1.1 esc-image-large.bmp, NONE, 1.1 esc-license.txt, NONE,
1.1 info-after.txt, NONE, 1.1 info-before.txt, NONE,
1.1 setup.iss, NONE, 1.1
Message-ID: <200707252013.l6PKD5n2015483@cvs-int.fedora.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15462
Added Files:
build.sh esc-image-large.bmp esc-license.txt info-after.txt
info-before.txt setup.iss
Log Message:
Initial revision.
--- NEW FILE build.sh ---
#!/bin/bash
# Command line arg values
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
###### Supported enrivonment variables ############
### MSVC_PATH - Path to the directory containing usual Microsoft dlls
### INNO_PATH - Path name of Inno installer executable
### CSP_PATH - Path to the directory containing the CSP if desired
NUM_ARGS=0
ARG_COMMAND=
# NSS values
# NSS needed just to help coolkey build
NSS_NAME=nss-3.11.4
NSS_ARCHIVE=$NSS_NAME-with-nspr-4.6.4
NSS_SOURCE_URL=https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_4_RTM/src/$NSS_ARCHIVE.tar.gz
#Inno installer values
#INNO_PATH="C:/Program Files/Inno Setup 5/ISCC.exe"
#Egate driver values
EGATE_DRIVER_URL=http://www.reflexreaders.com/Support/Downloads
EGATE_DRIVER_NAME=e-gate_W2k_XP_24.zip
#Zlib values
ZLIB_NAME=zlib
ZLIB_DLL=zlib1
ZLIB_ARCHIVE=zlib123-dll
ZLIB_BIN_URL=http://www.zlib.net
#CoolKey values
COOLKEY_NAME=coolkey
COOLKEY_TAG=COOLKEY_1_1_0
#Fedora repo for CoolKey and ESC
FEDORA_CVS_ROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
#Xulrunner values
XULRUNNER_ARCHIVE_NAME=xulrunner-1.8.0.4-source.tar.bz2
XULRUNNER_SRC_URL=http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/1.8.0.4/source/$XULRUNNER_ARCHIVE_NAME
#Base Dirctory calc
BASE_DIR=${PWD}
#ESC values
ESC_NAME=esc
ESC_VERSION_NO=1.0.1-5
#Cygwin values
ORIG_PATH=${PATH}
CYGWIN_BIN_PATH=/cygdrive/c/cygwin/bin
#Value for the location of Moz Tools needed to compile
MOZ_TOOLS_BIN_PATH=/cygdrive/c/moztools/bin:/cygdrive/d/moztools/bin
export PATH=${MOZ_TOOLS_BIN_PATH}:${ORIG_PATH}
CORE_OBJ_DIR=`uname``uname -r`_OPT.OBJ
export PATH=${ORIG_PATH}
function buildNSS {
echo "BUILDING NSS..."
if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doNSS ];
then
echo "Do not build NSS."
return 0
fi
cd $BASE_DIR
wget --no-check-certificate $NSS_SOURCE_URL
if [ ! -f ./$NSS_ARCHIVE.tar.gz ];
then
echo "Can't download NSS"
return 1
fi
tar -xzvf $NSS_ARCHIVE.tar.gz
if [ $? != 0 ];
then
echo "Can't untar NSS."
return 1
fi
cd $NSS_NAME/mozilla/security/nss
make BUILD_OPT=1 nss_build_all
if [ $? != 0 ];
then
echo "Can't make nss."
return 1
fi
return 0
}
function buildCOOLKEY {
echo "BUILDING COOLKEY..."
cd $BASE_DIR
if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doCoolKey ];
then
echo "Do not build CoolKey"
return 0
fi
export PATH=$CYGWIN_BIN_PATH:${PATH}
if [ -d coolkey ];
then
cvs -d $FEDORA_CVS_ROOT update -r $COOLKEY_TAG coolkey
else
cvs -d $FEDORA_CVS_ROOT co -r $COOLKEY_TAG coolkey
fi
cd $COOLKEY_NAME
autoconf-2.5x
if [ $? != 0 ];
then
echo "Coolkey autoconf failed.."
export PATH=${ORIG_PATH}
return 1
fi
ZLIB_INC_PATH=${BASE_DIR}/zlib/include
ZLIB_LIB_PATH=${BASE_DIR}/zlib/lib
ZLIB_LIB_FLAGS=${BASE_DIR}/zlib/$ZLIB_DLL.dll
ZLIB_INC_PATH=`cygpath -m $ZLIB_INC_PATH`
ZLIB_LIB_PATH=`cygpath -m $ZLIB_LIB_PATH`
ZLIB_LIB_FLAGS=`cygpath -m $ZLIB_LIB_FLAGS`
NSS_CFLAGS_BASE_PATH=${BASE_DIR}/$NSS_NAME/mozilla/dist
NSS_CFLAGS_BASE_PATH=`cygpath -m $NSS_CFLAGS_BASE_PATH`
NSS_CFLAGS="-I$NSS_CFLAGS_BASE_PATH/public/nss -I$NSS_CFLAGS_BASE_PATH/$CORE_OBJ_DIR/include" NSS_LIBS="$NSS_CFLAGS_BASE_PATH/$CORE_OBJ_DIR/lib/softokn3.lib advapi32.lib shell32.lib"
export ZLIB_LIB=$ZLIB_LIB_PATH
export ZLIB_INCLUDE=$ZLIB_INC_PATH
./configure NSS_CFLAGS="$NSS_CFLAGS" NSS_LIBS="$NSS_LIBS" --enable-pk11install
if [ $? != 0 ];
then
echo "Coolkey configure failed...."
export PATH=${ORIG_PATH}
return 1
fi
make LDFLAGS+="version.lib Setupapi.lib"
if [ $? != 0 ];
then
echo "Can't make coolkey."
export PATH=${ORIG_PATH}
return 1
fi
cd $BASE_DIR
# Grab coolkey and zlib
cp -f coolkey/src/coolkey/.libs/libcoolkeypk11.dll BUILD/coolkeypk11.dll
cp -f coolkey/src/libckyapplet/.libs/libckyapplet-1.dll BUILD
cp -f zlib/$ZLIB_DLL.dll BUILD
# Grab pk11install
cp -f coolkey/src/install/pk11install.exe BUILD
export PATH=${ORIG_PATH}
return 0
}
function obtainZLIB {
echo "OBTAINING ZLIB..."
cd $BASE_DIR
if [ -d ./$ZLIB_NAME ];
then
echo "ZLIB already done."
return 0
fi
mkdir -p $ZLIB_NAME
cd $ZLIB_NAME
wget $ZLIB_BIN_URL/$ZLIB_ARCHIVE.zip
if [ $? != 0 ];
then
echo "Can't obtain zlib bundle...."
return 1
fi
unzip $ZLIB_ARCHIVE.zip
if [ $? != 0 ];
then
echo "Can't unzip zlib bundle....."
return 1
fi
cp lib/zdll.lib ./$ZLIB_DLL.lib
return 0
}
function buildESC {
echo "BUILDING ESC"
cd $BASE_DIR
if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doEsc ];
then
echo "Do not build ESC."
return 0
fi
# if [ -d esc ];
# then
# cvs -d $FEDORA_CVS_ROOT update esc
# else
# cvs -d $FEDORA_CVS_ROOT co esc
# fi
if [ $? != 0 ];
then
echo "Can't check out ESC..."
return 1
fi
cd $ESC_NAME
mkdir -p dist/src
#mkdir -p dist/$CORE_OBJ_DIR
cd dist/src
if [ ! -d mozilla ];
then
echo "Obtaining XULRUNNER src..."
wget $XULRUNNER_SRC_URL
tar -xjvf $XULRUNNER_ARCHIVE_NAME
else
echo "Already have XULRUNNER src..."
fi
ZLIB_INC_PATH=${BASE_DIR}/zlib/include
ZLIB_INC_PATH=`cygpath -m $ZLIB_INC_PATH`
CKY_INCLUDE_PATH=${BASE_DIR}/coolkey/src/libckyapplet
CKY_INCLUDE_PATH=`cygpath -m $CKY_INCLUDE_PATH`
cd ../..
make BUILD_OPT=1 import
make BUILD_OPT=1 CKY_INCLUDE="-I$ZLIB_INC_PATH -I$CKY_INCLUDE_PATH" CKY_LIB_LDD=$CKY_INCLUDE_PATH/.libs ESC_VERSION=$ESC_VERSION_NO
if [ $? != 0 ];
then
echo "Can't make ESC."
return 1
fi
#take care of eginstall
cd src/app/eginstall
make BUILD_OPT=1 install
cd ../../..
cp dist/WIN*/coolkey_drivers/egate/eginstall.exe ../BUILD/egate
if [ $? != 0 ];
then
echo "Can't copy egate installer!"
return 1
fi
# hoist the build into the installer staging area
cd ..
cp -rf esc/dist/WIN*/esc_build/ESC BUILD
if [ $? != 0 ];
then
echo "Can't copy ESC to BUILD directory."
return 1
fi
return 0
}
function obtainCAPI {
cd $BASE_DIR
echo "OBTAINING the CAPI driver... CSP_PATH $CSP_PATH"
if [ -z $CSP_PATH ];
then
echo "No CSP path specified."
echo "Set environ var: CSP_PATH if desired . "
return 0
fi
cp $CSP_PATH/* BUILD
return 0
}
function obtainEGATE {
echo "OBTAINING EGINSTALL"
cd $BASE_DIR
if [ -d BUILD/egate ];
then
echo "Egate already obtained!"
return 0
fi
wget $EGATE_DRIVER_URL/$EGATE_DRIVER_NAME
if [ $? != 0 ];
then
echo "Can't obtain egate driver!"
return 1
fi
mkdir -p BUILD/egate
unzip $EGATE_DRIVER_NAME -d BUILD/egate
return 0
}
function initializeBUILD {
cd $BASE_DIR
echo "INITIALIZING BUILD..."
mkdir -p BUILD
if [ $? != 0 ];
then
echo "Can't initilize ESC Build...."
return 1
fi
return 0
}
function cleanupBUILD {
cd $BASE_DIR
echo "CLEANING up BUILD ..."
rm -rf *.gz
#rm -rf *.zip
return 0
}
function createINSTALLER {
echo "CREATING INSTALLER..."
cd $BASE_DIR
if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doInstaller ];
then
echo "Do not build the installer."
return 0
fi
if [ -z $MSVC_PATH ];
then
echo "NO MSVC path specified!"
echo "Set environ var: MSVC_PATH ."
fi
cp $MSVC_PATH/*.dll BUILD
if [ $? != 0 ];
then
echo "Cant copy over MSVC dlls."
fi
if [ -z "$INNO_PATH" ];
then
echo "No Path to the INNO installer specified!"
echo "Set environ var: INNO_PATH ."
return 0
fi
#Move over extra files we don't keep in the open source world
cp esc-image-large.bmp BUILD/ESC/chrome/content/esc
# Build the INNO executable installer
"$INNO_PATH" setup.iss
if [ $? != 0 ];
then
echo "Can't build final ESC installer...."
return 1
fi
return 0
}
function usage {
echo "usage: ./build.sh [ -doEsc || -doCoolKey || -doNSS || -doInstaller ]"
}
function processARGS {
if [ $NUM_ARGS -ne 1 ] ;
then
if [ $NUM_ARGS -ne 0 ];
then
echo "Number of args must be 1 or 0 !"
usage
exit 1
fi
fi
if [ -z $THE_ARG ];
then
return
fi
if [ $THE_ARG != -doEsc ] && [ $THE_ARG != -doCoolKey ] && [ $THE_ARG != -doNSS ] && [ $THE_ARG != -doInstaller ];
then
echo "Incorrect arguments!"
usage
exit 1
fi
}
########### Main program execution
NUM_ARGS=$#
echo "args $NUM_ARGS"
THE_ARG=$1
processARGS
initializeBUILD
if [ $? != 0 ];
then
exit 1
fi
obtainCAPI
if [ $? != 0 ];
then
exit 1
fi
obtainEGATE
if [ $? != 0 ];
then
exit 1
fi
buildNSS
if [ $? != 0 ];
then
echo "Issue building NSS."
fi
obtainZLIB
if [ $? != 0 ];
then
exit 1
fi
buildCOOLKEY
if [ $? != 0 ];
then
exit 1
fi
buildESC
if [ $? != 0 ];
then
exit 1
fi
createINSTALLER
if [ $? != 0 ];
then
exit 1
fi
cleanupBUILD
exit 0
--- NEW FILE esc-image-large.bmp ---
BM`+
Dh? ???D@
?????
??dD@
D
?????
???&D
???h?
DH???? D
D@
D@
D@
F????
D@
D
D@
D@
D
D@
dDDN?
H????
D
D@
???M?
D
D@
?dD? ???D
D@
D
D@
D@
D@
DJ??D
D@
D@
Dh??
DJ??D
D@
D@
D@
D@
????D
D@
D@
??D
D@
D???D
D@
D@
D@
D@
D@
D@
D@
DF???dD????dD
D@
L?DDn
D@
DL?D
D@
D@
?DDL?
D@
D@
?
D@
D@
D@
D
D@
D@
D
D@
D
D@
D@
D@
D@
D@
D@
D
D@
D@
???D
D@
D@
????d
D@
L?DF?
F????
D@
??DF?
D@
?DDF?
D@
?DDF?
D@
?DDF?
D@
?DDF?
D@
?DDF?
D@
?DDF?
D@
?DDF?
D
D@
Dh???dD
D@
?DDF?
D@
?DDF?
D@
?DDF?
???DJ
D@
???DJ
D@
DN?D
D@
D
D@
D@
D
D@
D@
???LD
DF??"D@
dDDj?
D
Dj????Dj???? D
???DH
??0D@
???DH
??0D@
???DH
???Dh????Dj????D
???DH
Dj????DH????Dj? ?
??6D@
??Dh?
??>D@
h????
?drD@
??rD@
??
??fD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
?tD@
? DHD?dD@
? DHD??D@
? DHD??D@
? DHD??D@
? D
? D
? D
? D
? D
? D
? D
? D
? D
? D
? D
? D
? D
? D
? D
? D
? D
? D
? f
?
?
^W^??
yPp
--- NEW FILE esc-license.txt ---
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
--- NEW FILE info-after.txt ---
Now that Smart Card Manager has been successfully installed, the program is currently running and ready to use. Place a supported smart card into the computer to begin using Smart Card Manager.
--- NEW FILE info-before.txt ---
This installation program will install the following:
1. Smart Card Manager.
2. Drivers for Smart Cards.
3. The PKCS #11 module needed for Smart Cards.
--- NEW FILE setup.iss ---
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
; BEGIN COPYRIGHT BLOCK
; This Program is free software; you can redistribute it and/or modify it under
; the terms of the GNU General Public License as published by the Free Software
; Foundation; version 2 of the License.
;
; This Program is distributed in the hope that it will be useful, but WITHOUT
; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
; FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
;
; You should have received a copy of the GNU General Public License along with
; this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
; Place, Suite 330, Boston, MA 02111-1307 USA.
;
; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
; END COPYRIGHT BLOCK
[Setup]
AppName=Smart Card Manager
AppMutex=ESCMutex
AppVerName=Smart Card Manager 1.0.1-6
AppPublisher=Fedora
CreateAppDir=true
Compression=lzma
SolidCompression=true
MinVersion=0,5.0.2195
ShowLanguageDialog=yes
OutputBaseFilename=SmartCardManagerSetup-1.0.1-6.win32.i386
DefaultDirName={pf}\Fedora\ESC
DisableProgramGroupPage=false
DefaultGroupName=Fedora
SetupIconFile=BUILD\ESC\components\esc.ico
UninstallDisplayIcon={app}\components\esc.ico
;WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp
WizardImageFile=esc-image-large.bmp
WizardSmallImageFile=BUILD\ESC\components\esc.bmp
AllowNoIcons=yes
LicenseFile=esc-license.txt
InfoBeforeFile=info-before.txt
InfoAfterFile=info-after.txt
PrivilegesRequired=admin
VersionInfoVersion=1.0.1.4
[Files]
Source: BUILD\egate\slbmgpg.dll; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\egate.cat; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\egate.inf; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\egate.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\egate_License.txt; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\egatebus.cat; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\egatebus.inf; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\egatebus.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\egaterdr.cat; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\egaterdr.inf; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\egaterdr.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\egdrvins1.dll; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\eginstall.exe; DestDir: {win}\egate2.4; Flags: ignoreversion
Source: BUILD\pk11install.exe; DestDir: {app}\PKCS11
;Files related to CSP, comment out if not available
Source: BUILD\clkcsp.dll; DestDir: {sys}; Flags: regserver restartreplace
Source: BUILD\cspres.dll; DestDir: {sys}; Flags: restartreplace
Source: BUILD\clkcsp.sig; DestDir: {sys}
Source: BUILD\atl71.dll; DestDir: {sys}; Flags: uninsneveruninstall onlyifdoesntexist
Source: BUILD\msvcr71.dll; DestDir: {sys}; Flags: uninsneveruninstall onlyifdoesntexist
Source: BUILD\msvcp71.dll; DestDir: {sys}; Flags: uninsneveruninstall onlyifdoesntexist
Source: BUILD\mfc71.dll; DestDir: {sys}; Flags: uninsneveruninstall onlyifdoesntexist
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
Source: BUILD\ESC\components\rhTray.xpt; DestDir: {app}\components
Source: BUILD\ESC\components\rhCoolKey.xpt; DestDir: {app}\components
Source: BUILD\ESC\components\rhICoolKey.xpt; DestDir: {app}\components
Source: BUILD\ESC\components\rhIKeyNotify.xpt; DestDir: {app}\components
Source: BUILD\ESC\components\rhITray.xpt; DestDir: {app}\components
Source: BUILD\ESC\components\rhITrayWindNotify.xpt; DestDir: {app}\components
Source: BUILD\ESC\components\rhTray.dll; DestDir: {app}\components
Source: BUILD\ESC\components\esc.ico; DestDir: {app}\components
Source: BUILD\ESC\components\rhCoolKey.dll; DestDir: {app}\components
Source: BUILD\coolkeypk11.dll; DestDir: {sys}; Flags: restartreplace
Source: BUILD\libckyapplet-1.dll; DestDir: {sys}; Flags: restartreplace
Source: BUILD\zlib1.dll;DestDir: {sys}; Flags: restartreplace
;Source: BUILD\coolkeypk11.dll; DestDir: {app}\PKCS11
Source: BUILD\ESC\esc.exe; DestDir: {app}
;Source: BUILD\ESC\esc.bat; Destdir: {app}
Source: BUILD\ESC\application.ini; DestDir: {app}
Source: BUILD\ESC\chrome\chrome.manifest; DestDir: {app}\chrome
Source: BUILD\ESC\chrome\content\esc\TRAY.js; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\CertInfo.js; DestDir: {app}\chrome\content\esc
;Source: BUILD\ESC\chrome\content\esc\certinfo.xul; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\config.xul; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\contents.rdf; DestDir: {app}\chrome\content\esc
;Source: BUILD\ESC\chrome\content\esc\EnrollPopupInclude.html; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\esc.css; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\ESC.js; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\esc.xul; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\security.xul; DestDir: {app}\chrome\content\esc
;Source: BUILD\ESC\chrome\content\esc\esc_browser.xul; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\GenericAuth.js; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\GenericAuth.xul; DestDir: {app}\chrome\content\esc
;Source: BUILD\ESC\chrome\content\esc\GenericAuthInclude.html; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\logo.gif; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\settings.xul; DestDir: {app}\chrome\content\esc
;Source: BUILD\ESC\chrome\content\esc\style.css; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\bg.jpg; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\xulrunner\chrome\toolkit.manifest; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\chrome\classic.jar; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\chrome\classic.manifest; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\chrome\comm.jar; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\chrome\comm.manifest; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\chrome\en-US.jar; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\chrome\en-US.manifest; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\chrome\pippki.jar; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\chrome\pippki.manifest; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\chrome\toolkit.jar; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\chrome\chromelist.txt; DestDir: {app}\xulrunner\chrome
Source: BUILD\ESC\xulrunner\xulrunner-stub.exe; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\dependentlibs.list; DestDir: {app}\xulrunner
;Source: BUILD\ESC\xulrunner\GenerateJavaInterfaces.exe; DestDir: {app}\xulrunner
;Source: BUILD\ESC\xulrunner\javaxpcom.jar; DestDir: {app}\xulrunner
;Source: BUILD\ESC\xulrunner\javaxpcomglue.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\js3250.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\LICENSE; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\mozctl.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\mozctlx.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\PKCS11
Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\PKCS11
Source: BUILD\ESC\xulrunner\nssckbi.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\PKCS11
Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\PKCS11
Source: BUILD\ESC\xulrunner\README.txt; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\smime3.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\softokn3.chk; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\PKCS11
Source: BUILD\ESC\xulrunner\ssl3.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\updater.exe; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\xpcom.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\xpicleanup.exe; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\xul.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\xulrunner.exe; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\AccessibleMarshal.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\components\xulutil.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\accessibility-msaa.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\alerts.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\appshell.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\appstartup.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\auth.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\autocomplete.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\autoconfig.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\autoconfig.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\caps.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\chardet.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\chrome.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\commandhandler.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\commandlines.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\composer.xpt; DestDir: {app}\xulrunner\components
;Source: BUILD\ESC\xulrunner\components\compreg.dat; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\content_base.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\content_html.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\content_htmldoc.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\content_xmldoc.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\content_xslt.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\content_xtf.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\directory.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\docshell_base.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_base.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_canvas.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_core.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_css.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_events.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_html.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_loadsave.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_range.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_stylesheets.xpt; DestDir: {app}\xulrunner\components
;Source: BUILD\ESC\xulrunner\components\dom_svg.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_traversal.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_views.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_xbl.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_xpath.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\dom_xul.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\downloads.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\editor.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\embed_base.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\extensions.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\exthandler.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\fastfind.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\find.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\gfx.xpt; DestDir: {app}\xulrunner\components
;Source: BUILD\ESC\xulrunner\components\gksvgrenderer.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\history.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\htmlparser.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\imgicon.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\imglib2.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\intl.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\intlcmpt.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\jar.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\jsconsole.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\jsconsole-clhandler.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\jsdservice.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\layout_base.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\layout_printing.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\layout_xul.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\layout_xul_tree.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\locale.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\lwbrk.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\mimetype.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\mozbrwsr.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\mozfind.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_about.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_cache.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_cookie.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_data.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_dns.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_file.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_ftp.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_http.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_res.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_socket.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_strconv.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\necko_viewsource.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsCloseAllWindows.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsDefaultCLH.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsDictionary.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsExtensionManager.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsHelperAppDlg.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsInterfaceInfoToIDL.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsKillAll.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsPostUpdateWin.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsProgressDialog.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsProxyAutoConfig.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsResetPref.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsUpdateService.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsXmlRpcClient.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\nsXULAppInstall.js; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\oji.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\passwordmgr.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\pipboot.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\pipboot.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\pipnss.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\pipnss.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\pippki.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\pippki.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\plugin.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\pref.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\prefetch.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\profile.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\progressDlg.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\proxyObject.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\rdf.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\satchel.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\shistory.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\toolkitprofile.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\transformiix.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\txmgr.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\txtsvc.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\uconv.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\unicharutil.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\universalchardet.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\update.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\uriloader.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\webBrowser_core.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\webbrowserpersist.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\webshell_idls.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\websrvcs.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\websrvcs.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\widget.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\windowds.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\windowwatcher.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xmlextras.dll; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xmlextras.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xml-rpc.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpcom_base.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpcom_components.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpcom_ds.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpcom_io.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpcom_obsolete.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpcom_thread.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpcom_xpti.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpconnect.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xpinstall.xpt; DestDir: {app}\xulrunner\components
;Source: BUILD\ESC\xulrunner\components\xpti.dat; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xulapp.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xulapp_setup.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xuldoc.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xulrunner.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\xultmpl.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\components\accessibility.xpt; DestDir: {app}\xulrunner\components
Source: BUILD\ESC\xulrunner\defaults\autoconfig\prefcalls.js; DestDir: {app}\xulrunner\defaults\autoconfig
Source: BUILD\ESC\xulrunner\defaults\autoconfig\platform.js; DestDir: {app}\xulrunner\defaults\autoconfig
Source: BUILD\ESC\xulrunner\defaults\pref\xulrunner.js; DestDir: {app}\xulrunner\defaults\pref
Source: BUILD\ESC\xulrunner\defaults\profile\chrome\userContent-example.css; DestDir: {app}\xulrunner\defaults\profile\chrome
Source: BUILD\ESC\xulrunner\defaults\profile\chrome\userChrome-example.css; DestDir: {app}\xulrunner\defaults\profile\chrome
Source: BUILD\ESC\xulrunner\defaults\profile\extensions\installed-extensions.txt; DestDir: {app}\xulrunner\defaults\profile\extensions
Source: BUILD\ESC\xulrunner\defaults\profile\extensions\Extensions.rdf; DestDir: {app}\xulrunner\defaults\profile\extensions
Source: BUILD\ESC\xulrunner\defaults\profile\US\localstore.rdf; DestDir: {app}\xulrunner\defaults\profile\US
Source: BUILD\ESC\xulrunner\defaults\profile\US\chrome\userContent-example.css; DestDir: {app}\xulrunner\defaults\profile\US\chrome
Source: BUILD\ESC\xulrunner\defaults\profile\US\chrome\userChrome-example.css; DestDir: {app}\xulrunner\defaults\profile\US\chrome
Source: BUILD\ESC\xulrunner\greprefs\xpinstall.js; DestDir: {app}\xulrunner\greprefs
Source: BUILD\ESC\xulrunner\greprefs\security-prefs.js; DestDir: {app}\xulrunner\greprefs
Source: BUILD\ESC\xulrunner\greprefs\all.js; DestDir: {app}\xulrunner\greprefs
Source: BUILD\ESC\xulrunner\plugins\npnul32.dll; DestDir: {app}\xulrunner\plugins
Source: BUILD\ESC\xulrunner\res\dtd\xhtml11.dtd; DestDir: {app}\xulrunner\res\dtd
Source: BUILD\ESC\xulrunner\res\dtd\mathml.dtd; DestDir: {app}\xulrunner\res\dtd
Source: BUILD\ESC\xulrunner\res\entityTables\transliterate.properties; DestDir: {app}\xulrunner\res\entityTables
Source: BUILD\ESC\xulrunner\res\entityTables\html40Special.properties; DestDir: {app}\xulrunner\res\entityTables
Source: BUILD\ESC\xulrunner\res\entityTables\html40Symbols.properties; DestDir: {app}\xulrunner\res\entityTables
Source: BUILD\ESC\xulrunner\res\entityTables\htmlEntityVersions.properties; DestDir: {app}\xulrunner\res\entityTables
Source: BUILD\ESC\xulrunner\res\entityTables\mathml20.properties; DestDir: {app}\xulrunner\res\entityTables
Source: BUILD\ESC\xulrunner\res\entityTables\html40Latin1.properties; DestDir: {app}\xulrunner\res\entityTables
Source: BUILD\ESC\xulrunner\res\fonts\mathfontSymbol.properties; DestDir: {app}\xulrunner\res\fonts
Source: BUILD\ESC\xulrunner\res\fonts\fontNameMap.properties; DestDir: {app}\xulrunner\res\fonts
Source: BUILD\ESC\xulrunner\res\fonts\mathfont.properties; DestDir: {app}\xulrunner\res\fonts
Source: BUILD\ESC\xulrunner\res\fonts\mathfontCMEX10.properties; DestDir: {app}\xulrunner\res\fonts
Source: BUILD\ESC\xulrunner\res\fonts\mathfontCMSY10.properties; DestDir: {app}\xulrunner\res\fonts
Source: BUILD\ESC\xulrunner\res\fonts\mathfontMath1.properties; DestDir: {app}\xulrunner\res\fonts
Source: BUILD\ESC\xulrunner\res\fonts\mathfontMath2.properties; DestDir: {app}\xulrunner\res\fonts
Source: BUILD\ESC\xulrunner\res\fonts\mathfontMath4.properties; DestDir: {app}\xulrunner\res\fonts
Source: BUILD\ESC\xulrunner\res\fonts\mathfontMTExtra.properties; DestDir: {app}\xulrunner\res\fonts
Source: BUILD\ESC\xulrunner\res\fonts\mathfontPUA.properties; DestDir: {app}\xulrunner\res\fonts
Source: BUILD\ESC\xulrunner\res\fonts\fontEncoding.properties; DestDir: {app}\xulrunner\res\fonts
Source: BUILD\ESC\xulrunner\res\html\gopher-unknown.gif; DestDir: {app}\xulrunner\res\html
Source: BUILD\ESC\xulrunner\res\html\gopher-binary.gif; DestDir: {app}\xulrunner\res\html
Source: BUILD\ESC\xulrunner\res\html\gopher-find.gif; DestDir: {app}\xulrunner\res\html
Source: BUILD\ESC\xulrunner\res\html\gopher-image.gif; DestDir: {app}\xulrunner\res\html
Source: BUILD\ESC\xulrunner\res\html\gopher-menu.gif; DestDir: {app}\xulrunner\res\html
Source: BUILD\ESC\xulrunner\res\html\gopher-movie.gif; DestDir: {app}\xulrunner\res\html
Source: BUILD\ESC\xulrunner\res\html\gopher-sound.gif; DestDir: {app}\xulrunner\res\html
Source: BUILD\ESC\xulrunner\res\html\gopher-telnet.gif; DestDir: {app}\xulrunner\res\html
Source: BUILD\ESC\xulrunner\res\html\gopher-text.gif; DestDir: {app}\xulrunner\res\html
Source: BUILD\ESC\xulrunner\res\html\gopher-audio.gif; DestDir: {app}\xulrunner\res\html
;Source: BUILD\ESC\xulrunner\sdk\lib\MozillaInterfaces-src.jar; DestDir: {app}\xulrunner\sdk\lib
;Source: BUILD\ESC\xulrunner\sdk\lib\MozillaInterfaces.jar; DestDir: {app}\xulrunner\sdk\lib
Source: BUILD\ESC\defaults\preferences\esc-prefs.js; DestDir: {app}\defaults\preferences
Source: BUILD\ESC\xulrunner\res\wincharset.properties; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\arrowd.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\bloatcycle.html; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\broken-image.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\charsetalias.properties; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\charsetData.properties; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\cmessage.txt; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\EditorOverride.css; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\forms.css; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\grabber.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\hiddenWindow.html; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\html.css; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\langGroups.properties; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\language.properties; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\loading-image.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\mathml.css; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\quirk.css; DestDir: {app}\xulrunner\res
;Source: BUILD\ESC\xulrunner\res\svg.css; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-add-column-after.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-add-column-after-active.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-add-column-after-hover.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-add-column-before.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-add-column-before-active.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-add-column-before-hover.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-add-row-after.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-add-row-after-active.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-add-row-after-hover.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-add-row-before.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-add-row-before-active.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-add-row-before-hover.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-remove-column.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-remove-column-active.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-remove-column-hover.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-remove-row.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-remove-row-active.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\table-remove-row-hover.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\ua.css; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\viewer.properties; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\viewsource.css; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\xulrunner\res\arrow.gif; DestDir: {app}\xulrunner\res
Source: BUILD\ESC\chrome\icons\default\esc-window.ico; DestDir: {app}\chrome\icons\default
Source: BUILD\ESC\chrome\icons\default\settings-window.ico; DestDir: {app}\chrome\icons\default
Source: BUILD\ESC\chrome\locale\en-US\esc.properties; DestDir: {app}\chrome\locale\en-US
Source: BUILD\ESC\chrome\locale\en-US\esc.dtd; DestDir: {app}\chrome\locale\en-US
Source: BUILD\ESC\chrome\content\esc\throbber-anim5.gif; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\2-vweak.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\3-weak.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\4-fair.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\5-good.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\6-strong.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\blank-card.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\enrolled-key.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\initializecard.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\progress.7.gif; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\1-none.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\components\escCLH.js; DestDir: {app}\components
;Source: BUILD\ESC\chrome\content\esc\hiddenWindow.html; DestDir: {app}\chrome\content\esc
;Source: BUILD\ESC\chrome\content\esc\aol.gif; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\AdvancedInfo.js; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\advancedinfo.xul; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\blank-cardx2.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\password.xul; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\enroll.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\enrolled-keyx2.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\enrollx2.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\esc-client-24.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\formatcard.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\formatcardx2.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\hiddenWindow.xul; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\initializecardx2.png; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\MineOverlay.xul; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\password.js; DestDir: {app}\chrome\content\esc
Source: BUILD\ESC\chrome\content\esc\certManager.xul; DestDir: {app}\chrome\content\esc
[Run]
Filename: {win}\egate2.4\eginstall.exe; Parameters: -f -l eginstall.txt; WorkingDir: {win}\egate2.4; Flags: waituntilterminated; StatusMsg: Installing smart card drivers....
Filename: {app}\PKCS11\pk11install.exe; Parameters: "-v ""name='CoolKey Module' library=coolkeypk11.dll NSS=""slotParams={{0x1=[slotFlags=PublicCerts]}"""""; WorkingDir: {sys}; StatusMsg: Configuring System for smart cards...
Filename: {app}\esc.exe; WorkingDir: {app}; StatusMsg: {code:GetEscStatusMsg} Flags: nowait
[UninstallDelete]
Type: filesandordirs; Name: {app}
[_ISTool]
OutputExeFilename=BUILD\coolkey-setup.exe
UseAbsolutePaths=false
LogFile=inst.log
LogFileAppend=false
[Registry]
;The following lines register the CSP. Comment out if not available
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Defaults\Provider\CoolKey PKCS#11 CSP; ValueType: string; ValueName: PKCS11Module; ValueData: coolkeypk11.dll; Flags: uninsdeletekey
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS#11 CSP
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATR; ValueData: 3b 75 94 00 00 62 02 02 00 00
;End CSP registration
Root: HKLM; Subkey: Software\
; Turn off the "pick a cert" dialog box
Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3; ValueType: dword; ValueName: 1A04; ValueData: 0
; Enable TLS 1.0
Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Internet Settings; ValueType: dword; ValueName: SecureProtocols; ValueData: 168
[Icons]
Name: {userdesktop}\Smart Card Manager; Filename: {app}\esc.exe; WorkingDir: {app}; IconFileName : {app}\components\esc.ico
Name: {group}\ESC\Smart Card Manager; Filename: {app}\esc.exe; WorkingDir: {app}; IconFileName : {app}\components\esc.ico
Name: {commonstartup}\Smart Card Manager; Filename: {app}\esc.exe; WorkingDir: {app}; IconFileName : {app}\components\esc.ico
[Dirs]
Name: {app}\PKCS11
Name: {app}\components; Flags: deleteafterinstall uninsalwaysuninstall
Name: {app}\chrome
Name: {app}\defaults
Name: {app}\xulrunner
Name: {app}\chrome\content
Name: {app}\chrome\icons
Name: {app}\chrome\content\esc
Name: {app}\chrome\locale
Name: {app}\chrome\locale\en-US
Name: {app}\chrome\icons\default
Name: {app}\xulrunner\chrome
Name: {app}\xulrunner\components
Name: {app}\xulrunner\defaults
Name: {app}\xulrunner\greprefs
Name: {app}\xulrunner\plugins
Name: {app}\xulrunner\res
Name: {app}\xulrunner\sdk
Name: {app}\xulrunner\defaults\autoconfig
Name: {app}\xulrunner\defaults\pref
Name: {app}\xulrunner\defaults\profile
Name: {app}\xulrunner\defaults\profile\chrome
Name: {app}\xulrunner\defaults\profile\extensions
Name: {app}\xulrunner\defaults\profile\US
Name: {app}\xulrunner\defaults\profile\US\chrome
Name: {app}\xulrunner\res\dtd
Name: {app}\xulrunner\res\entityTables
Name: {app}\xulrunner\res\fonts
Name: {app}\xulrunner\res\html
Name: {app}\xulrunner\sdk\lib
Name: {app}\xulrunner\estensions
Name: {app}\xulrunner\updates
Name: {app}\xulrunner\updates\0
Name: {app}\defaults\preferences
[Code]
function GetEscStatusMsg(Param: String) :string;
var MyMillis: LongInt;
begin
MyMillis := 5000;
Sleep(MyMillis);
Result := 'Starting Smart Card Manager.....';
end;
From fedora-directory-commits at redhat.com Wed Jul 25 20:14:20 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed, 25 Jul 2007 16:14:20 -0400
Subject: [Fedora-directory-commits] esc Makefile,1.2,1.3
Message-ID: <200707252014.l6PKEKLI015559@cvs-int.fedora.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15541
Modified Files:
Makefile
Log Message:
Make sure dist OBJDIR is created.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 13 Sep 2006 17:43:54 -0000 1.2
+++ Makefile 25 Jul 2007 20:14:17 -0000 1.3
@@ -22,3 +22,8 @@
include $(CORE_DEPTH)/coreconf/rules.mk
+ifeq ($(OS_ARCH), WINNT)
+import::
+ mkdir -p $(SOURCE_XP_DIR)/$(OBJDIR)
+endif
+
From fedora-directory-commits at redhat.com Wed Jul 25 20:14:52 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed, 25 Jul 2007 16:14:52 -0400
Subject: [Fedora-directory-commits] esc/src/app/eginstall - New directory
Message-ID: <200707252014.l6PKEqLE015593@cvs-int.fedora.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/src/app/eginstall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15578/eginstall
Log Message:
Directory /cvs/dirsec/esc/src/app/eginstall added to the repository
From fedora-directory-commits at redhat.com Wed Jul 25 20:15:22 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed, 25 Jul 2007 16:15:22 -0400
Subject: [Fedora-directory-commits] esc/src/app/eginstall Makefile, NONE,
1.1 eginstall.c, NONE, 1.1 instlib.c, NONE, 1.1 instlib.h, NONE, 1.1
Message-ID: <200707252015.l6PKFMPG015664@cvs-int.fedora.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/src/app/eginstall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15643
Added Files:
Makefile eginstall.c instlib.c instlib.h
Log Message:
Initial revision.
--- NEW FILE Makefile ---
#! gmake
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
CORE_DEPTH = ../../..
include $(CORE_DEPTH)/coreconf/config.mk
DIST = $(CORE_DEPTH)/dist/$(OBJDIR_NAME)
ifeq ($(OS_ARCH), WINNT)
WINNT = 1
endif
ifeq ($(OS_ARCH), Darwin)
MACOS = 1
endif
ifndef BUILD_OPT
ifdef WINNT
CFLAGS = -Z7
else
CFLAGS = -g
endif
CFLAGS += -DDEBUG
endif
ifdef WINNT
LIBS = \
version.lib \
Setupapi.lib \
Advapi32.lib \
$(NULL)
all: $(OBJDIR_NAME)/eginstall.exe
import:
@echo "Nothing to Import"
clean:
rm -f $(OBJDIR_NAME)/eginstall.exe $(OBJDIR_NAME)/eginstall.obj
libs: $(OBJDIR_NAME)/eginstall.exe
install:
mkdir -p $(DIST)/coolkey_drivers/egate/
cp $(OBJDIR_NAME)/eginstall.exe $(DIST)/coolkey_drivers/egate/
$(OBJDIR_NAME)/eginstall.exe: $(OBJDIR_NAME)/eginstall.obj
mkdir -p $(OBJDIR_NAME)
cl $(CFLAGS) -o $(OBJDIR_NAME)/eginstall.exe $(OBJDIR_NAME)/eginstall.obj $(LIBS)
# /link /subsystem:WINDOWS
editbin /subsystem:WINDOWS $(OBJDIR_NAME)/eginstall.exe
$(OBJDIR_NAME)/eginstall.obj: eginstall.c
mkdir -p $(OBJDIR_NAME)
cl -c -Fo$@ -DWINDOWS $(CFLAGS) eginstall.c
else
# MAC & Linux PC/SC-lite installer
ifdef MACOS
LIBS += -framework Security -framework Carbon
CFLAGS += -DMAC
RESTART = $(OBJDIR_NAME)/pcscd_restart
endif
COMMON_OBJS=$(OBJDIR_NAME)/instlib.o
all: $(OBJDIR_NAME)/eginstall $(RESTART)
import:
@echo "Nothing to Import"
clean:
rm -f $(OBJDIR_NAME)/eginstall $(COMMON_OBJS) $(OBJDIR_NAME)/eginstall.o $(OBJDIR_NAME)/pcscd_restart.sh $(OBJDIR_NAME)/pcscd_restart $(OBJDIR_NAME)/pcscd_restart.o
libs: $(OBJDIR_NAME)/eginstall $(RESTART)
install: libs
mkdir -p $(DIST)/coolkey_drivers/
cp $(OBJDIR_NAME)/eginstall $(DIST)/coolkey_drivers/
ifdef MACOS
cp $(OBJDIR_NAME)/pcscd_restart $(DIST)/coolkey_drivers/
rm -f $(OBJDIR_NAME)/"COOL Key Install"
ln $(OBJDIR_NAME)/eginstall $(OBJDIR_NAME)/"COOL Key Install"
rm -f $(DIST)/coolkey_drivers/"COOL Key Install"
ln $(DIST)/coolkey_drivers/eginstall $(DIST)/coolkey_drivers/"COOL Key Install"
endif
$(OBJDIR_NAME)/%.o: %.c
mkdir -p $(OBJDIR_NAME)
cc -c -o $@ $(CFLAGS) $<
$(OBJDIR_NAME)/eginstall: $(OBJDIR_NAME)/eginstall.o $(COMMON_OBJS)
mkdir -p $(OBJDIR_NAME)
cc -o $(OBJDIR_NAME)/eginstall $< $(COMMON_OBJS) $(LIBS)
$(OBJDIR_NAME)/pcscd_restart: $(OBJDIR_NAME)/pcscd_restart.o $(COMMON_OBJS)
mkdir -p $(OBJDIR_NAME)
cc -o $(OBJDIR_NAME)/pcscd_restart $< $(COMMON_OBJS) $(LIBS)
$(OBJDIR_NAME)/pcscd_restart.sh: pcscd_restart.sh.$(OS_ARCH)
cp $< $@
endif
export:
@echo "Nothing to Export"
--- NEW FILE eginstall.c ---
/* ***** BEGIN COPYRIGHT BLOCK *****
* * 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
** ***** END COPYRIGHT BLOCK *****/
#define LOGFILE "inst.log"
#ifdef WIN32
#define INITGUID 1
#include
#include
#include
#include
#include
#include
#define DRIVER_COUNT 4
/* This structure defines that descriptor used for each egate driver.
* the data described in the structure is static.
*/
typedef struct _driverInfo {
char *devClass; /* microsoft device class */
char *infFile; /* original inf file escribing the device */
char *instFile; /* file in the installation */
char *deviceID; /* Typical Device ID */
DWORD createFlags; /* Flags for hand creating device */
BOOL devClassUnique; /* true only if class is unique for egate */
BOOL doInstall; /* this driver should be installed */
BOOL handInstall;
} DriverInfo;
/* dynamically determined driver information */
typedef struct _dyDriverInfo {
char *oemFile; /* new OEM file */
char destPath[MAX_PATH];
} DyDriverInfo;
static const DriverInfo driverInfo[DRIVER_COUNT] = {
/* Egate PCSC device. Maps to a virtual reader. These are managed by
The Egate bus driver. */
{ "SmartCardReader", "egaterdr.inf", "egaterdr.sys",
"EGATEBUS", 0, FALSE, TRUE, FALSE },
/* Driver handling the actual card driver. This one is managed by the
plug and play handler. The first card is supposed to install the
EgateBus handler */
{ "EgateCard", "egate.inf", "egate.sys",
"USB\\VID_0973&PID_0001", 0, TRUE, TRUE, FALSE },
/* Egatebus is the Reader Enumerator. It starts new readers as necessary. */
{ "Egatebus", "egatebus.inf", "egatebus.sys",
"EGATEBUS", DICD_GENERATE_ID, TRUE, TRUE, TRUE },
/* Unknown driver is necessary for uninstall. If an egate device was inserted
before any egate drivers were installed, an Unknown device will have been
created. We need to remove it before we start our install */
{ "Unknown", "none.inf", "none.sys",
"USB\\VID_0973&PID_0001", 0, FALSE, FALSE, FALSE },
};
static DyDriverInfo dyDriverInfo[DRIVER_COUNT] = { 0 };
#define FILE_COUNT 8
static const char *deviceFileList[FILE_COUNT] = {
"drivers\\egate.sys",
"drivers\\egateraw.sys",
"egdrvins1.dll",
"egdrvins.dll",
"slbmqp98.dll",
"slbmgpg.dll",
"drivers\\egatebus.sys",
"drivers\\egaterdr.sys",
};
static char infFilePath[MAX_PATH];
static char logFilePath[MAX_PATH];
BOOL useOS = FALSE;
typedef unsigned long TIME;
void
profile(FILE *logFile, BOOL doProfile, char *message, void *arg, TIME last, TIME *retCurrent)
{
static TIME epoc = 0;
TIME current;
if (!doProfile) {
return;
}
current = GetTickCount();
if (epoc == 0) {
epoc = current;
}
if (retCurrent) {
*retCurrent = current;
}
if (!message) {
return;
}
fprintf(logFile,"@TIME:");
fprintf(logFile, message, arg);
fprintf(logFile," %d ms (%d ms total)\n", current - last, current - epoc);
}
#include
DEFINE_GUID(IDD_CLASS_EGATECARD,0x555e05a3,0x904c,0x42cf,0xae,0xf4,
0xee,0x40,0x35,0xec,0x63,0x62);
DEFINE_GUID(IDD_CLASS_EGATERDR,0x50dd5230,0xba8a,0x11d1,0xbf,0x5d,
0x00,0x00,0xf8,0x05,0xf5,0x30);
DEFINE_GUID(IDD_CLASS_EGATEBUS,0x9510ee5d,0x9613,0x439a,0xad,0xb9,
0xe4,0xde,0xa5,0xa6,0xb6,0x53);
static void
usage(char *prog)
{
fprintf(stderr,"usage: %s [-F][-q][-9][-u][-c][-p][-O][-l logfile] [egate_path]\n",prog);
fprintf(stderr,"\tu uninstall\tc clean\n");
fprintf(stderr,"\tp profile\tO use slow OS calls\n");
fprintf(stderr,"\tq quiet\n");
fprintf(stderr,"\tF and 9 reserved for future use\n");
return;
}
/* Utility printing functions */
/* capture the window's error string */
static void
winPerror(FILE *outFile, DWORD error, const char *msgString)
{
char buffer[256];
char *cp;
DWORD ret;
fprintf(outFile,"*** %s: ",msgString);
sprintf(buffer,"Format message problem, error = %d (0x%x)\n", error, error);
ret=FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, buffer,
sizeof(buffer), NULL);
for (cp=buffer; *cp; cp++) {
if (*cp == '\r') *cp = ' ';
}
fprintf(outFile, buffer);
}
#ifdef DEBUG
/* pretty raw dump a buffer in hex and ascii */
#define MAX_ROWS 16
void
dump(FILE *logFile, void *p, int len)
{
unsigned char *c = (char *)p;
char string[MAX_ROWS+1];
int i,j;
fprintf(logFile,"Dumping buffer %x size=%d\n",p,len);
for (i=0, j=0; i< len ; i++,j++) {
if (j >= MAX_ROWS) {
string[MAX_ROWS] = 0;
fprintf(logFile," %s\n",string);
j=0;
}
fprintf(logFile,"%02x ",c[i]);
string[j] = (char) (c[i] >= ' ' && c[i] <0x7f) ? c[i] : '.' ;
}
if (j && j < MAX_ROWS) {
string[j]= 0;
for (; j < MAX_ROWS; j++) {
fprintf(logFile," ");
}
fprintf(logFile," %s\n",string);
}
}
/* dump an InfInformation buffer */
void
printInf(FILE *logFile, const PSP_INF_INFORMATION sp_inf, DWORD len)
{
char *style = NULL;
switch (sp_inf->InfStyle) {
[...2099 lines suppressed...]
Copy("/etc/reader.conf","/etc/_reader.conf", 0644);
}
} else {
(void)RmFile("/etc/_reader.conf");
}
sprintf(buf,"%s/slbEGate.bundle",path);
install_path = strdup(buf);
if (egate_path) {
unsigned long current_version, install_version;
current_version = GetBundleVersion(egate_path);
install_version = GetBundleVersion(install_path);
if (current_version <= install_version) {
RmFile("/etc/reader.conf");
syslog(LOG_INFO,"Replacing version %d with version %d of %s\n",
current_version, install_version, "slbEGate.bundle");
} else {
syslog(LOG_INFO,
"Newer version of E-Gate already installed"
"(oldversion = %d, newversion = %d)\n",
current_version, install_version);
skip_reader_conf = 1;
}
free(egate_path);
}
if (!skip_reader_conf) {
/*
* we use _reader.conf so that we don't wind up with a partially
* updated file that we can't later recover from.
*/
if(!IsTiger)
{
int readerfd;
readerfd = open("/etc/_reader.conf", O_CREAT|O_APPEND|O_WRONLY, 0644);
if (readerfd < 0) {
syslog(LOG_ERR,
"Couldn't open /etc/_reader.conf for update err=%d (%s)\n",
errno, strerror(errno));
return RDRCNF_ERR(errno);
}
rc = write(readerfd, readerConf, sizeof(readerConf)-1);
if (rc < 0) {
syslog(LOG_ERR,
"Write Failure on /etc/_reader.conf err=%d (%s) fd=%d\n",
errno, strerror(errno), readerfd);
return RDRCNF_ERR(errno);
} else if (rc < sizeof(readerConf)-1) {
syslog(LOG_ERR,"only wrote %d bytes to /etc/_reader.conf\n", rc);
return RDRCNF_ERR(errno);
}
close(readerfd);
}
#ifdef MAC
// Install in same place whether Panther or Tiger
rc = Cpdir(install_path,TigerLibPath);
#else
rc = Cpdir(install_path,"/etc/reader/slbEGate.bundle");
#endif
if (rc < 0) {
syslog(LOG_ERR, "Failed to copy egate driver %s"
" to slbEGate.bundle err=%d (%s)\n", install_path,
errno, strerror(errno));
return RDRCNF_ERR(errno);
}
if(!IsTiger)
{
(void)RmFile("/etc/reader.conf");
rc = rename("/etc/_reader.conf","/etc/reader.conf");
if (rc < 0) {
syslog(LOG_ERR, "Failed to rename /etc/_reader.conf"
" to /etc/reader.conf err=%d\n", errno, strerror(errno));
return RDRCNF_ERR(errno);
}
}
syslog(LOG_INFO, "Installed egate. ");
}
pid = FindProcessByName("pcscd");
/* If nothing to install, don't restart pcscd */
if (skip_reader_conf && pid != -1) {
syslog(LOG_INFO,
"Nothing new to install, pcscd running: skip restarting pcscd\n");
return return_code;
}
if (pid != -1) {
syslog(LOG_INFO,"Killing PCSCD process id %d\n", pid);
kill( pid, SIGTERM );
/* wait 10 seconds for the process to die */
rc = WaitForProcessDeath(pid,10);
if (rc == PROCESS_ALIVE) {
kill(pid, SIGKILL);
rc = WaitForProcessDeath(pid,10);
}
if (rc != PROCESS_DEAD) {
syslog(LOG_ERR,"PCSCD still running!!!");
return RESTART_ERR(errno);
}
}
if (FileExists("/tmp/pcsc")) {
/* clean up old pcsc files */
syslog(LOG_INFO,"Cleaning up Old PCSC Files\n");
rc = RmDir("/tmp/pcsc");
if (rc != 0) {
syslog(LOG_ERR,"Failed to clean up /tmp/pcsc\n");
return_code = CLEANUP_ERR(errno);
}
}
/* now start pcscd */
#ifdef MAC
if(!IsTiger)
{
rc = system("/usr/sbin/pcscd");
}
else
{
rc = 0;
syslog(LOG_INFO,"Tiger 10.4.2 and later, does not start /usr/sbin/pcscd \n");
}
#else
rc = system("/usr/local/sbin/pcscd");
#endif
if (rc < 0) {
syslog(LOG_ERR,"Could't restart PCSCD err=%d (%s)\n",
errno, strerror(errno));
return_code = EXEC_ERR(errno);
}
#ifdef MAC
/* TODO this needs to be done for linux */
/* copy the restart command to /usr/sbin */
sprintf(buf,"%s/pcscd_restart",path);
/* do we need to verify a hash to make sure we are installing
* the correct pcscd_restart program? */
/* copy restart to /usr/sbin. We do this because once we install it,
* it cannot be removed unless the user becomes root. This allows the
* user to move around the photon installation without loosing the
* restart program. */
rc = Copy(buf,"/usr/sbin/pcscd_restart",0755);
if (rc < 0) {
/* not fatal.. */
syslog(LOG_INFO,"Couldn't copy pcscd_restart to /usr/sbin err=%d\n",
errno);
} else {
rc = Setuid("/usr/sbin/pcscd_restart");
if (rc < 0) {
/* not fatal... */
syslog(LOG_INFO,"Couldn't setuid on pcscd_restart err=%d\n", errno);
}
}
/* make sure the restart code works */
if(!isTigerDotTwo)
{
rc = SetupSystemBoot();
if (rc < 0) {
/* not fatal.. */
syslog(LOG_INFO,"Couldn't setup restart on boot err=%d\n",errno);
}
}
else
{
syslog(LOG_INFO,"Tiger 10.4.2 and later, don't do SetupSystemBoot to setup restart on boot.\n");
rc = RemoveSystemBoot();
if( rc < 0)
{
syslog(LOG_INFO,"Couldn't remove restart on boot err=%d\n",errno);
}
}
#endif
syslog(LOG_INFO,"Installation complete. return_code=%d\n",return_code);
return return_code;
}
#endif
--- NEW FILE instlib.c ---
/* ***** BEGIN COPYRIGHT BLOCK *****
** * 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
*** ***** END COPYRIGHT BLOCK *****/
/* MAC & Linux */
#ifndef WIN32
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include "instlib.h"
#define LOWER(c) (isalpha(c) ? tolower(c) : c)
int HasString(const char *target,const char *search) {
char c = LOWER(*search);
int len = strlen(search);
for ( ; *target; target++) {
if (LOWER(*target) == c) {
if (strncasecmp(target,search,len) == 0) {
return 1;
}
}
}
return 0;
}
int IsDirectory(const char *dir)
{
struct stat sbuf;
int rc;
rc = stat(dir,&sbuf);
if (rc == 0) {
return ((sbuf.st_mode & S_IFDIR) == S_IFDIR);
}
return 0;
}
int FileExists(const char *file)
{
struct stat sbuf;
int rc;
rc = stat(file,&sbuf);
if (rc == 0) {
return 1;
}
return 0;
}
#define MAX_RECURSE_LEVEL 15
#define DIR_MODE 0755
/*
* Create a directory. Create any missing or broken
* components we need along the way. If we already have a
* directory, return success.
*/
int Makedir(const char *directory, int level, int mode)
{
int rc;
char *buf, *cp;
/* prevent arbitrary stack overflow */
if (level > MAX_RECURSE_LEVEL) {
errno = ENAMETOOLONG;
return -1;
}
umask(0);
/* just try it first */
rc = mkdir(directory,DIR_MODE);
if (rc != 0) {
if (errno == EEXIST) {
if (IsDirectory(directory)) {
/* we have a directory, use it */
return 0;
} else { /* must be a file */
/* remove the file and try again */
rc = RmFile(directory);
if (rc == 0) {
rc = mkdir(directory, mode);
}
return rc;
}
}
/* if we fail because on of the subdirectory entries was a
* file, or one of the subdirectory entries didn't exist,
* move back one component and try the whole thing again
*/
if ((errno != ENOENT) && (errno != ENOTDIR)) {
return rc;
}
buf = (char *)malloc(strlen(directory)+1);
strcpy(buf,directory);
if (cp = strrchr(buf,'/')) {
*cp = 0;
rc = Makedir(buf,level+1, mode);
if (rc == 0) {
rc = mkdir(directory, mode);
}
}
free(buf);
}
return rc;
}
#define INFO_FILE "/Contents/Info.plist"
#define MAX_VERSION_TYPES 3
/* try to find the version number. NOTE: this is not a full xml parser. A full
* xml parser would be a bit better to use */
unsigned long GetBundleVersion(const char *bundle)
{
#ifdef xMAC
CFBundleRef bundle;
CURLRef url;
unsigned long version;
url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, bundle,
kCFURLPOSIXPathStyle, true );
if (!url) {
return 0;
}
bundle = CFBundleCreate(kCFAllocatorDefault, url);
CFRelease(url);
if (!bundle) {
return 0;
}
version = (unsigned long) CFBundleGetVersionNumber(bundle);
CFRelease(bundle);
return version;
#else
FILE *infoFile;
char *bundleFile;
char *str;
char buf[256];
int versions[MAX_VERSION_TYPES];
int i, currentType;
unsigned long version;
bundleFile = (char *)malloc(strlen(bundle) + strlen(INFO_FILE)+1);
if (bundleFile == NULL) {
return 0;
}
sprintf(bundleFile,"%s"INFO_FILE,bundle);
infoFile = fopen(bundleFile,"r");
free(bundleFile);
if (infoFile == NULL) {
return 0;
}
while ((str=fgets(buf, sizeof(buf),infoFile)) != NULL) {
if (HasString(str,"CFBundleVersion")) {
str=fgets(buf, sizeof(buf),infoFile);
break;
}
}
fclose(infoFile);
if (str == NULL) {
return 0;
}
while (*str && !isdigit(*str)) {
str++;
}
if (*str == 0) {
return 0;
}
for (i=0; i < MAX_VERSION_TYPES; i++) {
versions[i] = 0;
}
currentType = 0;
for (; currentType < MAX_VERSION_TYPES &&
*str && (isdigit(*str) || *str == '.'); str++) {
if (*str == '.') {
currentType++;
if (currentType >= MAX_VERSION_TYPES) {
break;
}
continue;
}
/* only record up to 2 digits for minor versions */
if ((currentType != 0) && (versions[currentType] >= 10)) {
versions[currentType] = 99;
continue;
}
versions[currentType] =
versions[currentType] * 10 + (*str) - '0';
}
/* now assemble the decoded version number */
version = 0;
for (i=0; i < MAX_VERSION_TYPES; i++) {
version = version * 100 + versions[i];
}
return version;
#endif
}
#define BUFSIZE 32*1024
int Copy(const char *src, const char *target, int mode)
{
int fdsrc,fdtarget;
int bytes,wbytes,rc = 0;
char buf[BUFSIZE];
fdsrc = open(src,O_RDONLY);
if (fdsrc < 0) {
return fdsrc;
}
fdtarget = open(target, O_WRONLY|O_CREAT|O_TRUNC, mode);
if (fdtarget < 0) {
close(fdsrc);
return fdtarget;
}
while ((bytes = read(fdsrc,buf,sizeof(buf))) > 0) {
wbytes = write(fdtarget,buf, bytes);
if (wbytes != bytes) {
rc = -1;
break;
}
}
if (bytes < 0) {
rc = bytes;
}
close(fdtarget);
close(fdsrc);
return rc;
}
int Cpdir(const char *source,const char *target)
{
FTS *dir;
FTSENT *entry;
int rc = 0;
char buf[MAXPATHLEN];
char *files[2];
int mode;
int cdir;
files[0]=".";
files[1]= 0;
cdir = open(".",O_RDONLY);
rc = chdir(source);
if (rc != 0) {
close(cdir);
return rc;
}
rc = Makedir(target, 0, DIR_MODE);
if (rc != 0) {
return rc;
}
dir = fts_open(files,FTS_NOCHDIR|FTS_LOGICAL,NULL);
if (dir == NULL) {
return -1;
}
while (entry = fts_read(dir)) {
sprintf(buf,"%s/%s",target,entry->fts_accpath);
mode = DIR_MODE;
if (entry->fts_statp) {
mode = entry->fts_statp->st_mode;
}
switch (entry->fts_info) {
case FTS_D:
/* need more .... */
rc = Makedir(buf, 0, mode);
break;
case FTS_F:
rc = Copy(entry->fts_path, buf, mode);
break;
}
if (rc != 0) break;
}
fchdir(cdir);
close(cdir);
fts_close(dir);
return rc;
}
int RmFile(const char *fileName)
{
int rc = unlink(fileName);
if ((rc < 0) && (errno == EPERM)) {
chmod(fileName,0644);
rc = unlink(fileName);
}
return rc;
}
int RmDir(const char *dirName)
{
int rc = 0;
int count = 0;
FTS *dir;
FTSENT *entry;
char *files[2];
files[0] = (char *) dirName;
files[1] = 0;
if (FileExists(dirName)) {
if (IsDirectory(dirName)) {
dir = fts_open(files,FTS_NOCHDIR|FTS_PHYSICAL,NULL);
if (dir == NULL) {
return -1;
}
while (entry = fts_read(dir)) {
switch (entry->fts_info) {
case FTS_DP:
count++;
rc = rmdir(entry->fts_path);
break;
case FTS_DEFAULT:
case FTS_SL:
case FTS_SLNONE:
case FTS_NS:
case FTS_NSOK:
case FTS_F:
rc = RmFile(entry->fts_path);
break;
}
if (rc != 0) break;
}
fts_close(dir);
if (count == 0) {
rc = rmdir(dirName);
}
return rc;
} else {
return RmFile(dirName);
}
}
return 0;
}
char *
GetFullPath(const char *prog, int includeProg) {
char *instDir, *end;
char *cwd = NULL;
char *new = NULL;
/* get the install directory */
instDir = strdup(prog);
if ((end = strrchr(instDir, '/')) == 0) {
if (includeProg) {
cwd = getcwd(NULL, 0);
new = (char *)malloc(strlen(cwd)+strlen(instDir)+2);
sprintf(new,"%s/%s",cwd,instDir);
} else {
new = getcwd(NULL,0);
}
} else {
if (!includeProg) {
*end = 0;
}
if (*instDir != '/') {
cwd = getcwd(NULL,0);
new = (char *)malloc(strlen(cwd)+strlen(instDir)+2);
char *instPtr = instDir;
/* handle . and .. prefixes */
if (*instDir == '.') {
if ((instDir[1] = 0) || /* . only */
((instDir[1] == '.') && /* .. & ../ */
((instDir[2] == '/') || (instDir[2] == 0))) ||
(instDir[1] == '/') ) { /* ./ */
instPtr++;
if (*instPtr == '.') {
/* back up one element */
if ((end = strrchr(cwd,'/')) == 0) {
*end = 0;
} else {
*cwd = 0;
}
instPtr++;
}
if (*instPtr == '/') {
instPtr ++;
}
}
}
sprintf(new,"%s/%s",cwd,instPtr);
}
}
if (cwd) {
free(cwd);
}
if (new) {
free(instDir);
instDir = new;
}
return instDir;
}
#ifdef MAC
typedef struct kinfo_proc kinfo_proc;
static const int listProc[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL, 0 };
static const int listProcLen=(sizeof(listProc)/sizeof(int)) -1;
#endif
/*
* find the PCSCD process
*/
#define MAX_RETRIES 100
int FindProcessByName(const char *procName)
{
#ifdef MAC
int ret;
kinfo_proc * pList;
size_t length;
int processCount;
int proc;
int i;
int pid = -1;
/*
* the process table is always changing. we may need to loop several times
* before we actually get the process list. We start with a large static
* buffer hoping that we don't have to actually allocate anything in the
* normal case
*/
pList = NULL;
length = 0;
/* don't hang forever */
for (i=0; i< MAX_RETRIES; i++) {
length = 0;
ret = sysctl( (int *) listProc, listProcLen, NULL, &length, NULL, 0);
if (ret < 0) {
break;
}
pList = malloc(length);
if (pList == NULL) {
break;
}
ret = sysctl( (int *) listProc, listProcLen, pList, &length, NULL, 0);
if (ret < 0) {
if (errno == ENOMEM) {
free(pList);
pList = NULL;
continue;
}
}
break;
}
/* just couldn't get our process list */
if (pList == NULL) {
perror("process list failed:");
return -1;
}
/* now loop through lookin for our process */
processCount = length / sizeof(kinfo_proc);
for (proc=0; proc < processCount; proc++) {
if (strcmp(pList[proc].kp_proc.p_comm,procName) == 0) {
pid = pList[proc].kp_proc.p_pid;
break;
}
}
free(pList);
return pid;
#else
return -1;
#endif
}
int
WaitForProcessDeath(int pid, int retries)
{
int rc;
int i;
/* loop for our retries until we can't send a signal to the process */
for (i=0; i < retries; i++) {
rc = kill(pid, 0);
if ( rc!= 0 ) {
break;
}
sleep(1);
}
if (rc == 0) {
/* process is still around past the retries */
return PROCESS_ALIVE;
}
if (errno == EPERM) {
/* we don't even have permission to kill the process */
return PROCESS_IMPERVIOUS;
}
/* process has been killed */
return PROCESS_DEAD;
}
#ifndef O_EXLOCK
#define O_EXLOCK 0
#endif
int
Setuid(const char *path) {
/* NULL for now */
struct stat statbuf;
int fd;
int rc, mode;
int ret = 0;
fd = open(path, O_NONBLOCK|O_RDONLY|O_EXLOCK, 0);
if (fd < 0) {
return errno;
}
/* Get info about the file */
rc = fstat(fd, &statbuf);
if (rc < 0) {
close(fd);
return errno;
}
/* make sure the file is owned by root */
if (statbuf.st_uid != 0) {
rc = fchown(fd, 0, statbuf.st_gid);
if (rc < 0) {
close(fd);
return errno;
}
}
/* turn off group and other write permission so the
* file can't be replaced */
mode = statbuf.st_mode & ~(S_IWGRP|S_IWOTH);
rc = fchmod(fd, mode | S_ISUID); /* set the uid bit */
if (rc < 0) ret = errno;
close(fd);
return ret;
}
const char smartCardServices[] = {
"#!/bin/sh\n"
"\n"
"##\n"
"# Start PC/SC\n"
"##\n"
"\n"
". /etc/rc.common\n"
"\n"
" ConsoleMessage \"Starting SmartCard Services\"\n"
" /usr/sbin/pcscd\n"
"\n" };
/* SmartcardServices */
/* StartupParameters.plist */
const char startupParametersPList[] = {
"{\n"
" Description = \"PC/SC Daemon\";\n"
" Provides = (\"SmartCardServices\");\n"
" Requires = ();\n"
" OrderPreference = \"None\";\n"
" Messages =\n"
" {\n"
" start = \"Starting SmartCard Services\";\n"
" stop = \"Stopping SmartCard Services\";\n"
" };\n"
"}\n"
"\n" };
#define STARTUP_DIR "/System/Library/StartupItems"
int
RemoveSystemBoot()
{
int rc;
if (IsDirectory(STARTUP_DIR"/SmartCardServices")) {
/*Blow it away **/
rc = RmDir(STARTUP_DIR"/SmartCardServices");
if (rc < 0) {
return -1;
}
}
return rc;
}
int
SetupSystemBoot()
{
int rc,fd;
if (!IsDirectory(STARTUP_DIR"/SmartCardServices")) {
/*check for errors and clean up so we don't have any partial installs*/
rc = Makedir(STARTUP_DIR"/SmartCardServices", 0, DIR_MODE);
if (rc < 0) {
return -1;
}
}
if (!FileExists(STARTUP_DIR"/SmartCardServices/SmartcardServices")) {
fd = open(STARTUP_DIR"/SmartCardServices/_SmartcardServices",
O_CREAT|O_TRUNC|O_WRONLY);
if (fd < 0) {
return -1;
}
rc = write(fd,smartCardServices,sizeof(smartCardServices)-1);
if (rc < 0) {
return -1;
}
if (rc < sizeof(smartCardServices)-1) {
return -1;
errno = ENOSPC;
return -1;
}
close(fd);
rc = rename(STARTUP_DIR"/SmartCardServices/_SmartcardServices",
STARTUP_DIR"/SmartCardServices/SmartcardServices");
if (rc < 0) {
return -1;
}
}
if (!FileExists(STARTUP_DIR"/SmartCardServices/StartupParameters.plist")) {
fd = open(STARTUP_DIR"/SmartCardServices/_StartupParameters.plist",
O_CREAT|O_TRUNC|O_WRONLY);
if (fd < 0) {
return -1;
}
rc = write(fd, startupParametersPList, sizeof(startupParametersPList)-1);
if (rc < 0) {
return -1;
}
if (rc < sizeof(startupParametersPList)-1) {
errno = ENOSPC;
return -1;
}
close(fd);
rc = rename(STARTUP_DIR"/SmartCardServices/_StartupParameters.plist",
STARTUP_DIR"/SmartCardServices/StartupParameters.plist");
if (rc < 0) {
return -1;
}
}
return 0;
}
#endif
--- NEW FILE instlib.h ---
/* ***** BEGIN COPYRIGHT BLOCK *****
*** * 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
*** ***** END COPYRIGHT BLOCK *****/
#ifndef _INSTLILB_H_
#define _INSTLILB_H_ 1
/* macros for encoding function return codes to pass to the calling
* process so it can present reasonable UI for when things go wrong */
#define MK_ERR(type,val) (((type)<<16)|((val)&0xffff))
#define _ABS(x) ((x) < 0 ? (x)*-1:(x))
#define _NORMALIZE(x,base,op) ((x) op (base) ? (x -(base)) : (x))
#define ARG_ERR(x) MK_ERR(0, x) /* 1, 2, 3 for x */
#define PID_ERR(x) MK_ERR(1, x) /* returned status */
#define AUTH_ERR(x) MK_ERR(2, _ABS(_NORMALIZE(x,-6000,<))) /* Mac auth */
#define RDRCNF_ERR(x) MK_ERR(3, x) /* errno */
#define EXEC_ERR(x) MK_ERR(4, x) /* errno */
#define RESTART_ERR(x) MK_ERR(5, x) /* errno */
#define CLEANUP_ERR(x) MK_ERR(6, x) /* errno */
#define BUFSIZE 32*1024
/* does the target string exist in search string. Case insensitive compare */
int HasString(const char *target,const char *search);
/* is the given file a directory */
int IsDirectory(const char *dir);
/* does the given file exist */
int FileExists(const char *file);
/* Make a directory path. removes regular files found along the path,
* recursively builds all the directories needed along the path
* (like mkdir -p) */
int Makedir(const char *directory, int level, int mode);
/* find the version number of a bundle */
unsigned long GetBundleVersion(const char *bundle);
/* copy file src to file specified by target */
int Copy(const char *src, const char *target, int mode);
/* copy a directory and all it's contents from source to target.
* symbolic links are followed */
int Cpdir(const char *source,const char *target);
/* Remove a File... force the removal with chown if necessary */
int RmFile(const char *file);
/* Remove a directory and all it's contents */
int RmDir(const char *directory);
/* expand the path name of a program name. if includeProg is true, the
* path includes the program name, otherwise it's just the directory path
* of the program */
char * GetFullPath(const char *prog, int includeProg);
/* find a process id from it's name. if more than on, only the first one is
* returned */
int FindProcessByName(const char *procName);
#define PROCESS_ALIVE 1
#define PROCESS_IMPERVIOUS 2
#define PROCESS_DEAD 3
/* wait for a process to die */
int WaitForProcessDeath(int pid, int retries);
/* set the permissions and UID bits on a file */
int Setuid(const char *path);
/* setup pcscd to restart on system boot */
int SetupSystemBoot(void);
#endif /* !_INSTLIB_H_ */
From fedora-directory-commits at redhat.com Wed Jul 25 20:16:03 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed, 25 Jul 2007 16:16:03 -0400
Subject: [Fedora-directory-commits] esc/src Makefile,1.3,1.4
Message-ID: <200707252016.l6PKG37n015713@cvs-int.fedora.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15693
Modified Files:
Makefile
Log Message:
Build "eginstall" on Windows.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 27 Sep 2006 17:50:24 -0000 1.3
+++ Makefile 25 Jul 2007 20:16:01 -0000 1.4
@@ -23,11 +23,11 @@
ifeq ($(OS_ARCH), WINNT)
-DIRS += xulrunner app/xpcom/tray app/xpcom win32
+DIRS += xulrunner app/eginstall app/xpcom/tray app/xpcom
endif
ifeq ($(OS_ARCH), Darwin)
-DIRS += xulrunner app/xpcom/tray app/xpcom mac
+DIRS += xulrunner app/xpcom/tray app/xpcom
endif
ifeq ($(OS_ARCH), Linux)
From fedora-directory-commits at redhat.com Wed Jul 25 20:43:24 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed, 25 Jul 2007 16:43:24 -0400
Subject: [Fedora-directory-commits] esc/src/lib/coolkey CoolKey.cpp, 1.7,
1.8 CoolKey.h, 1.6, 1.7 NSSManager.cpp, 1.4, 1.5 NSSManager.h,
1.3, 1.4
Message-ID: <200707252043.l6PKhO9K018357@cvs-int.fedora.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18328
Modified Files:
CoolKey.cpp CoolKey.h NSSManager.cpp NSSManager.h
Log Message:
Minor fix to diagnostics logging.
Index: CoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CoolKey.cpp 7 Jun 2007 21:21:17 -0000 1.7
+++ CoolKey.cpp 25 Jul 2007 20:43:22 -0000 1.8
@@ -1325,7 +1325,10 @@
return E_FAIL;
if(g_Log->IsInitialized())
+ {
+ CoolKeyLogNSSStatus();
return S_OK;
+ }
else
return E_FAIL;
}
@@ -1348,6 +1351,35 @@
return S_OK;
}
+COOLKEY_API HRESULT CoolKeyLogNSSStatus()
+{
+
+ char tBuff[56];
+ if (g_NSSManager)
+ {
+ unsigned int error = g_NSSManager->GetLastInitError();
+
+ if(error == NSS_NO_ERROR)
+ {
+ CoolKeyLogMsg( PR_LOG_ALWAYS, "%s NSS system intialized successfully!\n",GetTStamp(tBuff,56));
+ return S_OK;
+ }
+
+ if(error == NSS_ERROR_LOAD_COOLKEY)
+ {
+ CoolKeyLogMsg( PR_LOG_ERROR, "%s Failed to load CoolKey module! Keys will not be recognized!\n",GetTStamp(tBuff,56));
+ }
+
+ if(error == NSS_ERROR_SMART_CARD_THREAD)
+ {
+ CoolKeyLogMsg( PR_LOG_ERROR, "%s Problem initializing the Smart Card thread! Keys will not be recognized!\n",GetTStamp(tBuff,56));
+ }
+ }
+
+ return S_OK;
+
+}
+
//Utility function to get Time Stamp
char *GetTStamp(char *aTime,int aSize)
{
Index: CoolKey.h
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CoolKey.h 7 Jun 2007 21:21:17 -0000 1.6
+++ CoolKey.h 25 Jul 2007 20:43:22 -0000 1.7
@@ -180,6 +180,7 @@
COOLKEY_API HRESULT CoolKeyLogMsg(int logLevel, const char *fmt, ...);
+COOLKEY_API HRESULT CoolKeyLogNSSStatus();
//Utility time function
char *GetTStamp(char *aTime,int aSize);
Index: NSSManager.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/NSSManager.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NSSManager.cpp 7 May 2007 23:51:46 -0000 1.4
+++ NSSManager.cpp 25 Jul 2007 20:43:22 -0000 1.5
@@ -46,11 +46,13 @@
static PRLogModuleInfo *coolKeyLogNSS = PR_NewLogModule("coolKeyNSS");
+unsigned int NSSManager::lastError;
NSSManager::NSSManager()
{
char tBuff[56];
PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::NSSManager:\n",GetTStamp(tBuff,56)));
mpSCMonitoringThread = NULL;
+ NSSManager::lastError = NSS_NO_ERROR;
#ifdef LINUX
systemCertDB = NULL;
#endif
@@ -111,6 +113,8 @@
if(!userModule || !userModule->loaded)
{
PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("%s NSSManager::InitNSS problem loading PKCS11 module. No keys will be recognized!\n",GetTStamp(tBuff,56)));
+
+ NSSManager::lastError = NSS_ERROR_LOAD_COOLKEY;
return E_FAIL;
}
@@ -132,6 +136,7 @@
mpSCMonitoringThread = new SmartCardMonitoringThread(userModule);
if (!mpSCMonitoringThread) {
SECMOD_UnloadUserModule(userModule);
+ NSSManager::lastError = NSS_ERROR_SMART_CARD_THREAD;
return E_FAIL;
}
mpSCMonitoringThread->Start();
Index: NSSManager.h
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/NSSManager.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NSSManager.h 7 May 2007 23:51:46 -0000 1.3
+++ NSSManager.h 25 Jul 2007 20:43:22 -0000 1.4
@@ -26,6 +26,10 @@
#define PROMISCUOUS_PARAMETER "noAppletOK=yes"
#define NSS_PUBLIC_CERTS "slotFlags=PublicCerts"
+#define NSS_NO_ERROR 0
+#define NSS_ERROR_LOAD_COOLKEY 1
+#define NSS_ERROR_SMART_CARD_THREAD 2
+
#ifndef NSSMANAGER_H
#define NSSMANAGER_H
@@ -70,11 +74,14 @@
static HRESULT GetKeyIssuer(const CoolKey *aKey, char *aBuf, int aBufLength);
+ static unsigned int GetLastInitError() { return lastError;}
private:
static bool IsCACert(CERTCertificate *cert);
+ static unsigned int lastError;
+
#ifdef LINUX
PK11SlotInfo *systemCertDB;
#endif
From fedora-directory-commits at redhat.com Wed Jul 25 22:05:28 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 25 Jul 2007 18:05:28 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
DSDialogs.pm, 1.3, 1.4
Message-ID: <200707252205.l6PM5Sqg006031@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6014
Modified Files:
DSDialogs.pm
Log Message:
Resolves: bug 249633
Description: setup-ds.pl should create default org entries
Fix Description: Make the default in interactive mode to be to add those entries.
Index: DSDialogs.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSDialogs.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSDialogs.pm 12 Jul 2007 13:52:42 -0000 1.3
+++ DSDialogs.pm 25 Jul 2007 22:05:26 -0000 1.4
@@ -220,7 +220,8 @@
my $self = shift;
my $val = $self->{manager}->{inf}->{slapd}->{InstallLdifFile};
if (!defined($val)) {
- $val = 'none';
+ $val = 'suggest';
+ $self->{manager}->{inf}->{slapd}->{AddOrgEntries} = 'Yes';
}
return $val;
},
From fedora-directory-commits at redhat.com Wed Jul 25 23:12:18 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed, 25 Jul 2007 19:12:18 -0400
Subject: [Fedora-directory-commits] esc/win32 build.sh,1.1,1.2
Message-ID: <200707252312.l6PNCICw018512@cvs-int.fedora.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18494
Modified Files:
build.sh
Log Message:
Cleanup.
Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.sh 25 Jul 2007 20:13:02 -0000 1.1
+++ build.sh 25 Jul 2007 23:12:15 -0000 1.2
@@ -274,12 +274,12 @@
return 0
fi
-# if [ -d esc ];
-# then
-# cvs -d $FEDORA_CVS_ROOT update esc
-# else
-# cvs -d $FEDORA_CVS_ROOT co esc
-# fi
+ if [ -d esc ];
+ then
+ cvs -d $FEDORA_CVS_ROOT update esc
+ else
+ cvs -d $FEDORA_CVS_ROOT co esc
+ fi
if [ $? != 0 ];
then
From fedora-directory-commits at redhat.com Wed Jul 25 23:49:59 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Wed, 25 Jul 2007 19:49:59 -0400
Subject: [Fedora-directory-commits] coolkey/src/coolkey slot.cpp,1.7,1.8
Message-ID: <200707252349.l6PNnxhQ021873@cvs-int.fedora.redhat.com>
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21854
Modified Files:
slot.cpp
Log Message:
Don't filter based on ATR at all. Let the application deal with which cards
it wants to work with
Index: slot.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- slot.cpp 16 Feb 2007 21:16:11 -0000 1.7
+++ slot.cpp 25 Jul 2007 23:49:56 -0000 1.8
@@ -564,15 +564,10 @@
state = CARD_PRESENT;
}
- if ( CKYBuffer_DataIsEqual(&cardATR, ATR, sizeof (ATR)) ||
- CKYBuffer_DataIsEqual(&cardATR, ATR1, sizeof(ATR1)) ||
- CKYBuffer_DataIsEqual(&cardATR, ATR2, sizeof(ATR2)) ) {
-
- if (Params::hasParam("noAppletOK"))
- {
- state |= APPLET_SELECTABLE;
- mCoolkey = 1;
- }
+ if (Params::hasParam("noAppletOK"))
+ {
+ state |= APPLET_SELECTABLE;
+ mCoolkey = 1;
}
/* support CAC card. identify the card based on applets, not the ATRS */
From fedora-directory-commits at redhat.com Thu Jul 26 15:53:04 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 26 Jul 2007 11:53:04 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client AboutDialog.java,
1.7, 1.8 FrameworkInitializer.java, 1.3,
1.4 default.properties, 1.7, 1.8
Message-ID: <200707261553.l6QFr4Rg020325@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20155/src/com/netscape/management/client
Modified Files:
AboutDialog.java FrameworkInitializer.java default.properties
Log Message:
Resolves: 249642
Summary: Don't combine theme name with framework version.
Index: AboutDialog.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/AboutDialog.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AboutDialog.java 29 Jun 2007 20:32:27 -0000 1.7
+++ AboutDialog.java 26 Jul 2007 15:53:02 -0000 1.8
@@ -25,6 +25,7 @@
import java.awt.*;
import com.netscape.management.client.util.*;
+import com.netscape.management.client.console.*;
/**
* AboutDialog is a class to display a standard "about box",
@@ -103,7 +104,10 @@
}
- GridBagUtil.constrain(content, new MultilineLabel(copyright),
+ GridBagUtil.constrain(content, new MultilineLabel(copyright + "\n\n" +
+ (new ResourceSet("com.netscape.management.client.default")).
+ getString("aboutDialog", "dialogFrameworkPrefix") + " " +
+ VersionInfo.getVersionNumber()),
1, 0, 1, 1, 1, 0, GridBagConstraints.NORTH,
GridBagConstraints.HORIZONTAL, 0, 0,
SEPARATED_COMPONENT_SPACE, 0);
Index: FrameworkInitializer.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/FrameworkInitializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FrameworkInitializer.java 2 Jul 2007 18:49:18 -0000 1.3
+++ FrameworkInitializer.java 26 Jul 2007 15:53:02 -0000 1.4
@@ -264,7 +264,7 @@
ResourceSet themeResource = new ResourceSet("com.netscape.management.client.theme.theme");
aboutDialog = new AboutDialog(parent,
themeResource.getString("defaultAbout",
- "dialogTitle") + " " + VersionInfo.getVersionNumber());
+ "dialogTitle"));
aboutDialog.setProduct( new RemoteImage(
themeResource.getString("defaultAbout",
"productLogo")),
Index: default.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/default.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- default.properties 29 Jun 2007 20:32:27 -0000 1.7
+++ default.properties 26 Jul 2007 15:53:02 -0000 1.8
@@ -90,6 +90,7 @@
dialog-closetext=There are unsaved changes. Would you like to close?
aboutDialog-dialogTitlePrefix=About
+aboutDialog-dialogFrameworkPrefix=Using Console Framework
permTab-title=UI Permissions
permTab-accessButton=&Permissions...
From fedora-directory-commits at redhat.com Thu Jul 26 20:40:13 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 26 Jul 2007 16:40:13 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
DSCreate.pm.in, 1.2, 1.3
Message-ID: <200707262040.l6QKeDm8022178@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22130
Modified Files:
DSCreate.pm.in
Log Message:
Resolves: #249722
Summary: restart-slapd has an unreplaced token {{INST-DIR}}
Description: hash key, value: INST-DIR => $inf->{slapd}->{inst_dir} is added
Index: DSCreate.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DSCreate.pm.in 13 Jul 2007 19:51:48 -0000 1.2
+++ DSCreate.pm.in 26 Jul 2007 20:40:11 -0000 1.3
@@ -216,6 +216,7 @@
"BAK-DIR" => $inf->{slapd}->{bak_dir},
"SERVER-DIR" => $inf->{General}->{ServerRoot},
"CONFIG-DIR" => $inf->{slapd}->{config_dir},
+ "INST-DIR" => $inf->{slapd}->{inst_dir},
"RUN-DIR" => $inf->{slapd}->{run_dir},
"PRODUCT-NAME" => "slapd",
"SERVERBIN-DIR" => $inf->{slapd}->{sbindir},
From fedora-directory-commits at redhat.com Thu Jul 26 23:08:50 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 26 Jul 2007 19:08:50 -0400
Subject: [Fedora-directory-commits] console fedora-console, NONE,
1.1 build.properties, 1.11, 1.12 build.xml, 1.14,
1.15 fedora-console.spec, 1.2, 1.3 startconsole, 1.7, NONE
Message-ID: <200707262308.l6QN8oIq027338@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27292
Modified Files:
build.properties build.xml fedora-console.spec
Added Files:
fedora-console
Removed Files:
startconsole
Log Message:
Resolves: 249777
Summary: Moved preference dir name into theme. Did some cleanup to the specfile around post and preun steps. Renamed start script.
--- NEW FILE fedora-console ---
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
# 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
# END COPYRIGHT BLOCK
JAVA=`which java`
if [ -z "$JAVA" -o ! -x "$JAVA" ]
then
echo "$0: The java program is not in your path, or is not executable.";
exit 1
fi
CLASSDEST=@classdest@
#
# Launch the Console
#
java -ms8m -mx64m -cp @jssjar@:@ldapjdkjar@:$CLASSDEST/@basejar@:$CLASSDEST/@mccjar@:$CLASSDEST/@mcclangjar@:$CLASSDEST/@nmclfjar@:$CLASSDEST/@nmclflangjar@:$CLASSDEST/@themejar@ -Djava.library.path=@libdir@ -Djava.util.prefs.systemRoot="$HOME/. at prefsdir@" -Djava.util.prefs.userRoot="$HOME/. at prefsdir@" com.netscape.management.client.console.Console $*
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.properties 29 Jun 2007 20:32:26 -0000 1.11
+++ build.properties 26 Jul 2007 23:08:46 -0000 1.12
@@ -40,7 +40,7 @@
base.name=${base.core}-${console.dotversion}
base.gen.name=${base.core}-${console.dotgenversion}
-theme.core=${console.brand}-theme
+theme.core=${console.brand}-console
theme.name=${theme.core}-${console.dotversion}
theme.gen.name=${theme.core}-${console.dotgenversion}
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 29 Jun 2007 20:32:26 -0000 1.14
+++ build.xml 26 Jul 2007 23:08:46 -0000 1.15
@@ -184,9 +184,9 @@
-
-
-
+
+
+
@@ -196,6 +196,7 @@
+
Index: fedora-console.spec
===================================================================
RCS file: /cvs/dirsec/console/fedora-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-console.spec 29 Jun 2007 20:32:26 -0000 1.2
+++ fedora-console.spec 26 Jul 2007 23:08:46 -0000 1.3
@@ -3,7 +3,7 @@
Name: fedora-console
Version: %{major_version}.%{minor_version}
-Release: 1
+Release: 2
Group: Applications
Vendor: Fedora Project
URL: http://directory.fedora.redhat.com
@@ -46,15 +46,15 @@
install -d $RPM_BUILD_ROOT/usr/share/java
install -m777 built/release/jars/fedora-* $RPM_BUILD_ROOT/usr/share/java
install -d $RPM_BUILD_ROOT/usr/bin
-install -m777 built/release/startconsole $RPM_BUILD_ROOT/usr/bin
+install -m777 built/release/%{name} $RPM_BUILD_ROOT/usr/bin
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-/usr/share/java/fedora-theme-%{version}_en.jar
-/usr/bin/startconsole
+/usr/share/java/%{name}-%{version}_en.jar
+/usr/bin/%{name}
%files framework
%defattr(-,root,root)
@@ -63,9 +63,14 @@
/usr/share/java/fedora-mcc-%{version}_en.jar
/usr/share/java/fedora-nmclf-%{version}.jar
/usr/share/java/fedora-nmclf-%{version}_en.jar
-
+
%post
cd /usr/share/java
+ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar
+ln -s %{name}-%{version}_en.jar %{name}_en.jar
+
+%post framework
+cd /usr/share/java
ln -s fedora-base-%{version}.jar fedora-base-%{major_version}.jar
ln -s fedora-base-%{version}.jar fedora-base.jar
ln -s fedora-mcc-%{version}.jar fedora-mcc-%{major_version}.jar
@@ -76,10 +81,12 @@
ln -s fedora-nmclf-%{version}.jar fedora-nmclf.jar
ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf-%{major_version}_en.jar
ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf_en.jar
-ln -s fedora-theme-%{version}_en.jar fedora-theme-%{major_version}_en.jar
-ln -s fedora-theme-%{version}_en.jar fedora-theme_en.jar
%preun
+rm -rf /usr/share/java/%{name}-%{major_version}_en.jar
+rm -rf /usr/share/java/%{name}_en.jar
+
+%preun framework
rm -rf /usr/share/java/fedora-base-%{major_version}.jar
rm -rf /usr/share/java/fedora-base.jar
rm -rf /usr/share/java/fedora-mcc-%{major_version}.jar
@@ -90,11 +97,13 @@
rm -rf /usr/share/java/fedora-nmclf.jar
rm -rf /usr/share/java/fedora-nmclf-%{major_version}_en.jar
rm -rf /usr/share/java/fedora-nmclf_en.jar
-rm -rf /usr/share/java/fedora-theme-%{major_version}_en.jar
-rm -rf /usr/share/java/fedora-theme_en.jar
%changelog
-* Fri Jun 29 2007 Nathan Kinder 1.1.0-2
+- Updated start script and theme jar names. Fixed post and
+ preun steps for framework subpackage.
+
+* Fri Jun 29 2007 Nathan Kinder 1.1.0-1
- Updated for 1.1.0 release
* Mon Nov 14 2005 Nathan Kinder 1.0-1
--- startconsole DELETED ---
From fedora-directory-commits at redhat.com Thu Jul 26 23:08:51 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 26 Jul 2007 19:08:51 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/console
Console.java, 1.10, 1.11
Message-ID: <200707262308.l6QN8pef027344@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27292/src/com/netscape/management/client/console
Modified Files:
Console.java
Log Message:
Resolves: 249777
Summary: Moved preference dir name into theme. Did some cleanup to the specfile around post and preun steps. Renamed start script.
Index: Console.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Console.java 2 Jul 2007 18:49:24 -0000 1.10
+++ Console.java 26 Jul 2007 23:08:48 -0000 1.11
@@ -53,6 +53,15 @@
static long _t0 = System.currentTimeMillis();
//
+ // global values
+ //
+ public static Preferences _preferences;
+ public static ConsoleInfo _info;
+ public static String _consoleAdminURL;
+ public static ResourceSet _resource = new ResourceSet("com.netscape.management.client.console.console");
+ public static ResourceSet _resource_theme = new ResourceSet("com.netscape.management.client.theme.theme");
+
+ //
// preference information
//
public static final String IDENTIFIER = "Console";
@@ -70,22 +79,13 @@
public static final String PREFERENCE_Y = "Y";
public static final String PREFERENCE_DIR = System.getProperty("user.home") + File.separator +
- ".fedora-console" + File.separator;
+ _resource_theme.getString("console","prefsdir") + File.separator;
public static final String OPTION_NOWINPOS = "nowinpos";
public static final String OPTION_NOLOGO = "nologo";
public static final String OPTION_JAVALAF = "javalaf";
- public static final int MAX_RECENT_URLS = 5;
-
- //
- // global values
- //
- public static Preferences _preferences;
- public static ConsoleInfo _info;
- public static String _consoleAdminURL;
- public static ResourceSet _resource = new ResourceSet("com.netscape.management.client.console.console");
- public static ResourceSet _resource_theme = new ResourceSet("com.netscape.management.client.theme.theme");
+ public static final int MAX_RECENT_URLS = 5;
//
// private values
From fedora-directory-commits at redhat.com Thu Jul 26 23:08:52 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 26 Jul 2007 19:08:52 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/theme
theme.properties, 1.3, 1.4
Message-ID: <200707262308.l6QN8qRY027348@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/theme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27292/src/com/netscape/management/client/theme
Modified Files:
theme.properties
Log Message:
Resolves: 249777
Summary: Moved preference dir name into theme. Did some cleanup to the specfile around post and preun steps. Renamed start script.
Index: theme.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/theme/theme.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- theme.properties 2 Jul 2007 18:49:25 -0000 1.3
+++ theme.properties 26 Jul 2007 23:08:49 -0000 1.4
@@ -20,6 +20,7 @@
console-title=Fedora Management Console
console-useragent=Fedora-Management-Console
+console-prefsdir=.fedora-console
login-title=Fedora Management Console Login
banner-console=Fedora Management Console
From fedora-directory-commits at redhat.com Fri Jul 27 01:35:31 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 26 Jul 2007 21:35:31 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff
ds_removal.in, NONE, 1.1
Message-ID: <200707270135.l6R1ZVPf020385@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20336/admserv/cfgstuff
Added Files:
ds_removal.in
Log Message:
resolves: #247215
Summary: Reimplement ds_remove (cgi) and ds_removal (command line wrapper) without setuputil code (comment #23)
--- NEW FILE ds_removal.in ---
#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
Usage()
{
echo "Usage: $0 -s server_id -w admin_password"
echo " server_id: Directory server identifier; slapd-"
echo " admin_password: Administration user password"
}
err0=""
err1=""
err2=""
server_id=""
admin_pw=""
while [ "$1" != "" ]
do
if [ "$1" = "-s" ]; then
shift
server_id=$1
elif [ "$1" = "-w" ]; then
shift
admin_pw=$1
elif [ "$1" = "-h" -o "$1" = "-H" -o "$1" = "--help" ]; then
Usage
exit 0
else
err0="Option $1 is not supported. "
fi
if [ "$1" != "" ]; then
shift
fi
done
if [ "$server_id" = "" ]; then
err1="Directory Server identifier is missing. "
fi
if [ "$admin_pw" = "" ]; then
err2="Administration user password is missing. "
fi
if [ "$err0" != "" -o "$err1" != "" -o "$err2" != "" ];then
echo Error: ${err0}${err1}${err2}
Usage
exit 1
fi
PASSWORD_PIPE=STDIN; export PASSWORD_PIPE
QUERY_STRING="InstanceName=slapd-${server_id}"; export QUERY_STRING
SERVER_NAMES=slapd-${server_id}; export SERVER_NAMES
REQUEST_METHOD=GET; export REQUEST_METHOD
if [ -c /dev/null ]; then
NULL=/dev/null
else
NULL=/tmp/ds_remove.out
fi
@cgibindir@/ds_remove > $NULL << EOF
Password: ${admin_pw}
EOF
exit $?
From fedora-directory-commits at redhat.com Fri Jul 27 01:35:31 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 26 Jul 2007 21:35:31 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40
ds_remove.in, 1.3, 1.4
Message-ID: <200707270135.l6R1ZV4H020391@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20336/admserv/cgi-src40
Modified Files:
ds_remove.in
Log Message:
resolves: #247215
Summary: Reimplement ds_remove (cgi) and ds_removal (command line wrapper) without setuputil code (comment #23)
Index: ds_remove.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_remove.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ds_remove.in 24 Jul 2007 20:10:15 -0000 1.3
+++ ds_remove.in 27 Jul 2007 01:35:29 -0000 1.4
@@ -30,16 +30,24 @@
use FileConn;
use Resource;
+# remove_tree($centry, $key, $instname, [$isparent, [$dontremove]])
+# $centry: entry to look for the path to be removed
+# $key: key to look for the path in the entry
+# $instname: instance name "slapd-" to check the path
+# $isparent: specify 1 to remove from the parent dir
+# $dontremove: pattern not to be removed (e.g., ".db$")
sub remove_tree
{
my $centry = shift;
my $key = shift;
my $instname = shift;
my $isparent = shift;
+ my $dontremove = shift;
foreach my $path ( @{$centry->{$key}} )
{
my $rmdir = "";
+ my $rc = 0;
if ( 1 == $isparent )
{
$rmdir = dirname($path);
@@ -50,8 +58,55 @@
}
if ( -d $rmdir && $rmdir =~ /$instname/ )
{
- my $rc = rmtree($rmdir);
- print STDERR "rmtree: $rmdir => RC: $rc\n";
+ if ( "" eq "$dontremove" )
+ {
+ $rc = rmtree($rmdir);
+ if ( 0 == $rc )
+ {
+ print "Content-type: text/plain\n\n";
+ print "NMC_ErrInfo: $rmdir was not removed.\n";
+ print STDERR "Warning: $rmdir was not removed.\n";
+ }
+ }
+ else
+ {
+ # Skip the dontremove files
+ $rc = opendir(DIR, $rmdir);
+ if ($rc)
+ {
+ while (defined(my $file = readdir(DIR)))
+ {
+ next if ( "$file" =~ /$dontremove/ );
+ next if ( "$file" eq "." );
+ next if ( "$file" eq ".." );
+ my $rmfile = $rmdir . "/" . $file;
+ my $rc0 = rmtree($rmfile);
+ if ( 0 == $rc0 )
+ {
+ print "Content-type: text/plain\n\n";
+ print "NMC_ErrInfo: $rmfile was not removed.\n";
+ print STDERR "Warning: $rmfile was not removed.\n";
+ }
+ }
+ closedir(DIR);
+ }
+ my $newrmdir = $rmdir . ".removed";
+ my $rc1 = 1;
+ if ( -d $newrmdir )
+ {
+ $rc1 = rmtree($newrmdir);
+ if ( 0 == $rc1 )
+ {
+ print "Content-type: text/plain\n\n";
+ print "NMC_ErrInfo: $newrmdir was not removed.\n";
+ print STDERR "Warning: $newrmdir was not removed.\n";
+ }
+ }
+ if ( 0 < $rc1 )
+ {
+ rename($rmdir, $newrmdir);
+ }
+ }
}
}
}
@@ -83,12 +138,23 @@
my $instname = $query->param('InstanceName');
my ($slapd, $inst) = split(/-/, $instname, 2);
+my $configdir = "@instconfigdir@/slapd-$inst";
+if ( ! -d $configdir )
+{
+ print "Content-type: text/plain\n\n";
+ print "NMC_ErrInfo: $configdir does not exist\n";
+ print "NMC_Status: 1\n";
+ print STDERR "Error: $configdir does not exist\n";
+ exit 1;
+}
my @errs;
-my $inf = createInfFromConfig("@instconfigdir@/slapd-$inst", $inst, \@errs);
-if (@errs) {
+my $inf = createInfFromConfig($configdir, $inst, \@errs);
+if (@errs)
+{
print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
+ print STDERR "Error: ", $res->getText(@errs), "\n";
exit 1;
}
@@ -108,14 +174,43 @@
my $dn = "cn=config";
my $entry = $conn->search($dn, "base", "(cn=*)", 0);
-if (!$entry) {
+if (!$entry)
+{
print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: Search $dn in $dseldif failed: $entry\n";
print "NMC_Status: 1\n";
+ print STDERR "Error: Search $dn in $dseldif failed: $entry\n";
+ exit 1;
+}
+
+# Unregister the server from the configuration ds
+# get config ds url from input or admconf
+# get admin id from input or admconf
+# must get admin password from input (PASSWORD_PIPE?)
+# get admin domain
+# config ds info
+if (!unregisterDSWithConfigDS($inst, \@errs, $inf))
+{
+ print "Content-type: text/plain\n\n";
+ print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
+ print "NMC_Status: 1\n";
+ print STDERR "Error:", $res->getText(@errs), "\n";
+ exit 1;
+}
+
+$dn = "cn=config,cn=ldbm database,cn=plugins,cn=config";
+my $dbentry = $conn->search($dn, "base", "(cn=*)", 0);
+if (!$dbentry)
+{
+ print "Content-type: text/plain\n\n";
+ print "NMC_ErrInfo: Search $dn in $dseldif failed: $dbentry\n";
+ print "NMC_Status: 1\n";
+ print "Error: Search $dn in $dseldif failed: $dbentry\n";
exit 1;
}
+$conn->close();
-# stop the server first
+# stop the server
my $instdir = "";
foreach my $path ( @{$entry->{"nsslapd-instancedir"}} )
{
@@ -131,56 +226,51 @@
# Ignore the stop failure
print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: Could not stop directory server: $output\n";
+ print STDERR "Warning: Could not stop directory server: $output\n";
}
$instdir = $path; # need to use it later...
} else {
print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: The program $prog does not exist\n";
print "NMC_Status: 1\n";
+ print STDERR "Error: The program $prog does not exist\n";
exit 1;
}
}
}
-
-# Unregister the server from the configuration ds
-# get config ds url from input or admconf
-# get admin id from input or admconf
-# must get admin password from input (PASSWORD_PIPE?)
-# get admin domain
-# config ds info
-if (!unregisterDSWithConfigDS($inst, \@errs, $inf)) {
- print "Content-type: text/plain\n\n";
- print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
- print "NMC_Status: 1\n";
- exit 1;
-}
-
+
# remove physical dirs/files
-$dn = "cn=config,cn=ldbm database,cn=plugins,cn=config";
-my $dbentry = $conn->search($dn, "base", "(cn=*)", 0);
-if (!$dbentry) {
- print "Content-type: text/plain\n\n";
- print "NMC_ErrInfo: Search $dn in $dseldif failed: $dbentry\n";
- print "NMC_Status: 1\n";
- exit 1;
-}
remove_tree($dbentry, "nsslapd-directory", $instname, 1);
remove_tree($dbentry, "nsslapd-db-logdirectory", $instname, 1);
remove_tree($entry, "nsslapd-lockdir", $instname);
remove_tree($entry, "nsslapd-tmpdir", $instname);
remove_tree($entry, "nsslapd-bakdir", $instname, 1);
remove_tree($entry, "nsslapd-errorlog", $instname, 1);
-remove_tree($entry, "nsslapd-schemadir", $instname, 1);
# instance dir
-if ( -d $instdir )
+if ( -d $instdir && $instdir =~ /$instname/ )
{
# clean up pid files (if any)
remove_pidfile("STARTPIDFILE", $instdir, $instname);
remove_pidfile("PIDFILE", $instdir, $instname);
+ if ( 1 == isConfigDS($instname, "@instconfigdir@/admin-serv") )
+ {
+ # if it is the Config DS, adm.conf and local.conf needs to be removed.
+ unlink("@instconfigdir@/admin-serv/adm.conf");
+ unlink("@instconfigdir@/admin-serv/local.conf");
+ }
+
my $rc = rmtree($instdir);
+ if ( 0 == $rc )
+ {
+ print "Content-type: text/plain\n\n";
+ print "NMC_ErrInfo: $instdir was not removed.\n";
+ print STDERR "Warning: $instdir was not removed.\n";
+ }
}
+# Finally, config dir
+remove_tree($entry, "nsslapd-schemadir", $instname, 1, "\.db\$");
# if we got here, report success
print "Content-type: text/plain\n\n";
From fedora-directory-commits at redhat.com Fri Jul 27 01:35:31 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 26 Jul 2007 21:35:31 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
AdminUtil.pm.in, 1.11, 1.12
Message-ID: <200707270135.l6R1ZVQH020397@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20336/admserv/newinst/src
Modified Files:
AdminUtil.pm.in
Log Message:
resolves: #247215
Summary: Reimplement ds_remove (cgi) and ds_removal (command line wrapper) without setuputil code (comment #23)
Index: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AdminUtil.pm.in 24 Jul 2007 20:10:16 -0000 1.11
+++ AdminUtil.pm.in 27 Jul 2007 01:35:29 -0000 1.12
@@ -23,12 +23,12 @@
updateAdmConf updateAdmpw updateLocalConf importCACert
getLocalConfigDS getPset registerDSWithConfigDS
registerManyDSWithConfigDS createSubDSNoConn
- unregisterDSWithConfigDS);
+ unregisterDSWithConfigDS isConfigDS);
@EXPORT_OK = qw(getAdmConf getConfigDSConn createConfigDS createSubDS
updateAdmConf updateAdmpw updateLocalConf importCACert
getLocalConfigDS getPset registerDSWithConfigDS
registerManyDSWithConfigDS createSubDSNoConn
- unregisterDSWithConfigDS);
+ unregisterDSWithConfigDS isConfigDS);
# load perldap
use Mozilla::LDAP::Conn;
@@ -130,6 +130,19 @@
return "$configdir/admin-serv";
}
+sub isConfigDS {
+ my $inst = shift;
+ my $configdir = shift;
+ my $admConf = getAdmConf ($configdir);
+ my $ldapstart = $admConf->{ldapStart};
+ my $expected = $inst . "/start-slapd";
+ if ( "$ldapstart" eq "$expected" ) {
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
sub getConfigDSConn {
my $url = shift;
my $id = shift;
@@ -229,6 +242,10 @@
$inf->{slapd}->{RootDN},
$inf->{slapd}->{RootDNPwd},
$inf->{General}->{certdir});
+ if (!$conn) {
+ @{$errs} = ('error_connection_failed');
+ return 0;
+ }
# add the NetscapeRoot suffix
@{$errs} = addSuffix($conn, "o=NetscapeRoot", "NetscapeRoot");
@@ -597,6 +614,7 @@
unlink($instinf->{filename});
$instinf->{General}->{ConfigDirectoryLdapURL} =
$inf->{General}->{ConfigDirectoryLdapURL};
+ $instinf->{General}->{AdminDomain} = $inf->{General}->{AdminDomain};
if (!registerDSWithConfigDS($inst, $errs, $instinf,
$conn, $admConf, $configdir)) {
return 0;
From fedora-directory-commits at redhat.com Fri Jul 27 01:42:48 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 26 Jul 2007 21:42:48 -0400
Subject: [Fedora-directory-commits] adminserver Makefile.am, 1.23,
1.24 Makefile.in, 1.23, 1.24
Message-ID: <200707270142.l6R1gmY5020901@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20804
Modified Files:
Makefile.am Makefile.in
Log Message:
resolves: #249739
Summary: Implement a script registering DS to the Configuration DS (comment #1-4)
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.am 11 Jul 2007 01:20:21 -0000 1.23
+++ Makefile.am 27 Jul 2007 01:42:46 -0000 1.24
@@ -161,18 +161,22 @@
ds_start ds_restart ds_shutdown ds_ldif2db ds_db2ldif ds_bak2db \
ds_db2bak ds_listdb ds_rmdb ds_snmpctrl ds_vlvindex ds_addindex
-bin_SCRIPTS = admserv/newinst/src/register_server.pl
cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove
-nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
+nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin \
+ admserv/cfgstuff/stop-ds-admin \
+ admserv/cfgstuff/restart-ds-admin \
+ admserv/cfgstuff/ds_removal
cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \
- admserv/newinst/src/migrate-ds-admin.pl
+ admserv/newinst/src/migrate-ds-admin.pl \
+ admserv/newinst/src/register-ds-admin.pl
perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \
admserv/newinst/src/AdminUtil.pm \
admserv/newinst/src/AdminServer.pm \
admserv/newinst/src/ConfigDSDialogs.pm \
- admserv/newinst/src/AdminMigration.pm
+ admserv/newinst/src/AdminMigration.pm \
+ admserv/newinst/src/RegDSDialogs.pm
libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES)
libds_admin_serv_la_LINK = $(MYLINK)
@@ -370,6 +374,7 @@
# regular property files go here
property_DATA = admserv/newinst/src/setup-ds-admin.res \
admserv/newinst/src/migrate-ds-admin.res \
+ admserv/newinst/src/register-ds-admin.res \
admserv/cgi-src40/ds_create.res \
admserv/cgi-src40/ds_remove.res
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.in 11 Jul 2007 01:20:21 -0000 1.23
+++ Makefile.in 27 Jul 2007 01:42:46 -0000 1.24
@@ -99,13 +99,13 @@
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" \
- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cgibindir)" \
- "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" \
- "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" \
- "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" \
- "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" \
- "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" \
- "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"
+ "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" \
+ "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" \
+ "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" \
+ "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" \
+ "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" \
+ "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \
+ "$(DESTDIR)$(propertydir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libds_admin_serv_la_LIBADD =
@@ -238,14 +238,13 @@
am_viewlog_OBJECTS = admserv/cgi-src40/viewlog.$(OBJEXT)
viewlog_OBJECTS = $(am_viewlog_OBJECTS)
viewlog_DEPENDENCIES = $(am__DEPENDENCIES_2)
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
cgibinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
initSCRIPT_INSTALL = $(INSTALL_SCRIPT)
nodist_cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
perlSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(bin_SCRIPTS) $(cgibin_SCRIPTS) $(cmdbin_SCRIPTS) \
- $(init_SCRIPTS) $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS)
+SCRIPTS = $(cgibin_SCRIPTS) $(cmdbin_SCRIPTS) $(init_SCRIPTS) \
+ $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -588,17 +587,22 @@
admserv/newinst/src/dirserver.map \
admserv/newinst/src/asmigrate.map
-bin_SCRIPTS = admserv/newinst/src/register_server.pl
cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove
-nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
+nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin \
+ admserv/cfgstuff/stop-ds-admin \
+ admserv/cfgstuff/restart-ds-admin \
+ admserv/cfgstuff/ds_removal
+
cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \
- admserv/newinst/src/migrate-ds-admin.pl
+ admserv/newinst/src/migrate-ds-admin.pl \
+ admserv/newinst/src/register-ds-admin.pl
perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \
admserv/newinst/src/AdminUtil.pm \
admserv/newinst/src/AdminServer.pm \
admserv/newinst/src/ConfigDSDialogs.pm \
- admserv/newinst/src/AdminMigration.pm
+ admserv/newinst/src/AdminMigration.pm \
+ admserv/newinst/src/RegDSDialogs.pm
libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES)
libds_admin_serv_la_LINK = $(MYLINK)
@@ -775,6 +779,7 @@
# regular property files go here
property_DATA = admserv/newinst/src/setup-ds-admin.res \
admserv/newinst/src/migrate-ds-admin.res \
+ admserv/newinst/src/register-ds-admin.res \
admserv/cgi-src40/ds_create.res \
admserv/cgi-src40/ds_remove.res
@@ -1272,25 +1277,6 @@
viewlog$(EXEEXT): $(viewlog_OBJECTS) $(viewlog_DEPENDENCIES)
@rm -f viewlog$(EXEEXT)
$(viewlog_LINK) $(viewlog_LDFLAGS) $(viewlog_OBJECTS) $(viewlog_LDADD) $(LIBS)
-install-binSCRIPTS: $(bin_SCRIPTS)
- @$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- @list='$(bin_SCRIPTS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p; then \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
- else :; fi; \
- done
-
-uninstall-binSCRIPTS:
- @$(NORMAL_UNINSTALL)
- @list='$(bin_SCRIPTS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
install-cgibinSCRIPTS: $(cgibin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(cgibindir)" || $(mkdir_p) "$(DESTDIR)$(cgibindir)"
@@ -2540,7 +2526,7 @@
$(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -2612,7 +2598,7 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-install-exec-am: install-binSCRIPTS install-libLTLIBRARIES
+install-exec-am: install-libLTLIBRARIES
install-info: install-info-recursive
@@ -2640,14 +2626,14 @@
ps-am:
-uninstall-am: uninstall-binSCRIPTS uninstall-cgibinPROGRAMS \
- uninstall-cgibinSCRIPTS uninstall-cmdbinSCRIPTS \
- uninstall-dist_helpDATA uninstall-dist_htmlDATA \
- uninstall-dist_iconDATA uninstall-infDATA uninstall-info-am \
- uninstall-initSCRIPTS uninstall-ldifDATA \
- uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
- uninstall-nodist_configDATA uninstall-nodist_propertyDATA \
- uninstall-perlSCRIPTS uninstall-propertyDATA
+uninstall-am: uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \
+ uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \
+ uninstall-dist_htmlDATA uninstall-dist_iconDATA \
+ uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \
+ uninstall-ldifDATA uninstall-libLTLIBRARIES \
+ uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \
+ uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
+ uninstall-propertyDATA
uninstall-info: uninstall-info-recursive
@@ -2659,12 +2645,11 @@
distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-recursive distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
- html-am info info-am install install-am install-binSCRIPTS \
- install-cgibinPROGRAMS install-cgibinSCRIPTS \
- install-cmdbinSCRIPTS install-data install-data-am \
- install-data-hook install-dist_helpDATA install-dist_htmlDATA \
- install-dist_iconDATA install-exec install-exec-am \
- install-infDATA install-info install-info-am \
+ html-am info info-am install install-am install-cgibinPROGRAMS \
+ install-cgibinSCRIPTS install-cmdbinSCRIPTS install-data \
+ install-data-am install-data-hook install-dist_helpDATA \
+ install-dist_htmlDATA install-dist_iconDATA install-exec \
+ install-exec-am install-infDATA install-info install-info-am \
install-initSCRIPTS install-ldifDATA install-libLTLIBRARIES \
install-man install-nodist_cmdbinSCRIPTS \
install-nodist_configDATA install-nodist_propertyDATA \
@@ -2674,14 +2659,14 @@
maintainer-clean-recursive mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-binSCRIPTS uninstall-cgibinPROGRAMS \
- uninstall-cgibinSCRIPTS uninstall-cmdbinSCRIPTS \
- uninstall-dist_helpDATA uninstall-dist_htmlDATA \
- uninstall-dist_iconDATA uninstall-infDATA uninstall-info-am \
- uninstall-initSCRIPTS uninstall-ldifDATA \
- uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
- uninstall-nodist_configDATA uninstall-nodist_propertyDATA \
- uninstall-perlSCRIPTS uninstall-propertyDATA
+ uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \
+ uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \
+ uninstall-dist_htmlDATA uninstall-dist_iconDATA \
+ uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \
+ uninstall-ldifDATA uninstall-libLTLIBRARIES \
+ uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \
+ uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
+ uninstall-propertyDATA
define NL
\\n
From fedora-directory-commits at redhat.com Fri Jul 27 01:42:48 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 26 Jul 2007 21:42:48 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
RegDSDialogs.pm, NONE, 1.1 register-ds-admin.pl.in, NONE,
1.1 register-ds-admin.res.in, NONE, 1.1 AdminServer.pm.in, 1.7,
1.8 ConfigDSDialogs.pm, 1.5, 1.6 setup-ds-admin.res.in, 1.5, 1.6
Message-ID: <200707270142.l6R1gmt6020907@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20804/admserv/newinst/src
Modified Files:
AdminServer.pm.in ConfigDSDialogs.pm setup-ds-admin.res.in
Added Files:
RegDSDialogs.pm register-ds-admin.pl.in
register-ds-admin.res.in
Log Message:
resolves: #249739
Summary: Implement a script registering DS to the Configuration DS (comment #1-4)
--- NEW FILE RegDSDialogs.pm ---
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
package RegDSDialogs;
use strict;
use DialogManager;
use Setup;
use Dialog;
use Util;
my $configdsinfo = new Dialog (
$TYPICAL,
'use_existing_configds_txt',
sub {
my $self = shift;
my $servid = $self->{manager}->{inf}->{slapd}->{ServerIdentifier};
return $servid;
},
sub {
my $self = shift;
my $ans = shift;
my $index = shift;
my $res = $DialogManager::SAME;
$self->{manager}->setType($TYPICAL);
if ($index == 0) {
# validate serverIdentifier?
foreach my $inst (@{$self->{manager}->{inf}->{slapd}->{Instances}})
{
if ( "$inst" eq "slapd-" . $ans )
{
$self->{manager}->{inf}->{slapd}->{ServerIdentifier} = $ans;
$res = $DialogManager::NEXT;
goto out;
}
}
out:
if ( $DialogManager::SAME == $res )
{
$self->{manager}->alert("error_configds_txt", $ans);
}
return $res;
}
return $res;
},
['dialog_dsserverid_prompt']
);
sub getDialogs {
return ($configdsinfo);
}
1;
--- NEW FILE register-ds-admin.pl.in ---
#!/usr/bin/env perl
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
use lib "@perldir@";
use File::Basename;
use Net::Domain qw(hostfqdn);
# Admin Setup modules
use AdminUtil;
use AdminServer;
# Directory Setup modules
use Resource;
use Setup;
use SetupLog;
use DialogManager;
use Inf;
use Util;
sub reg_get_passwd
{
my $setup = shift;
my $key = shift;
my $value = shift;
print("\n==============================================================================\n");
$setup->msg(0, $key, $value);
system("stty -echo");
my $ans = ;
system("stty echo");
print "\n";
chop($ans);
return $ans;
}
my $res = new Resource("@propertydir@/register-ds-admin.res",
"@propertydir@/setup-ds-admin.res",
"@propertydir@/setup-ds.res");
my $setup = new Setup($res);
$setup->msg('begin_ds_registration');
# get existing instances
my $instconfigdir = $setup->{configdir};
my @instances = ();
for my $dir (glob("$setup->{configdir}/slapd-*")) {
if (-d $dir) {
push @instances, basename($dir);
}
}
if ( $#instances < 0 )
{
$setup->msg($FATAL, 'error_no_ds');
$setup->doExit(1);
}
# see if there is already a configds
my $admConf = AdminUtil::getAdmConf("$instconfigdir/admin-serv");
my @admConfKeys = keys %$admConf;
my $orig_confdsid = "";
my $new_confdsid = "";
my $adminuid = "";
my @errs = ();
my $fqdn = hostfqdn();
# set defaults
if ( $#admConfKeys >= 0 )
{
# Admin Server is installed; that is Config DS exists, which may be
# replaced with a new one in the RegDSDialogs
$orig_confdsid = getLocalConfigDS("$instconfigdir/admin-serv");
$setup->{inf}->{slapd}->{ServerIdentifier} = $orig_confdsid;
$setup->{inf}->{slapd}->{Instances} = \@instances;
$setup->{inf}->{General}->{ConfigDirectoryLdapURL} = $admConf->{ldapurl};
$setup->{inf}->{General}->{ConfigDirectoryAdminID} = $admConf->{userdn};
$setup->{inf}->{General}->{AdminDomain} = $admConf->{AdminDomain};
$setup->{inf}->{General}->{SuiteSpotUserID} = $admConf->{SuiteSpotUserID};
$setup->{inf}->{General}->{SuiteSpotGroup} = $admConf->{SuiteSpotGroup};
($setup->{inf}->{General}->{FullMachineName} = $admConf->{ldapurl}) =~
s/.*:\/\/(.*):[0-9]*\/.*/\1/;
$setup->{inf}->{admin}->{SysUser} = $admConf->{sysuser};
$adminuid = $admConf->{userdn};
# read additional config from config DS
my $pset = AdminUtil::getPset($admConf);
if ($pset && %{$pset}) {
$setup->{inf}->{admin}->{Port} = $pset->{"configuration.nsserverport"};
$setup->{asorigport} = $pset->{"configuration.nsserverport"}; # save orig. port
$setup->{inf}->{admin}->{ServerIpAddress} = $pset->{"configuration.nsserveraddress"};
}
my $admpw = AdminUtil::getAdmpw($admConf);
if ($admpw && %{$admpw}) {
$setup->{inf}->{admin}->{ServerAdminID} = $admpw->{ServerAdminID};
$setup->{inf}->{admin}->{ServerAdminPwd} = $admpw->{ServerAdminPwd};
}
$setup->{reconfigas} = 1; # allow AS reconfig
my $dialogmgr = new DialogManager($setup, $res, $TYPICAL);
require RegDSDialogs;
my @dialogs = RegDSDialogs->getDialogs();
$dialogmgr->addDialog(@dialogs);
my $rc = $dialogmgr->run();
if ($rc)
{
$setup->doExit(1);
}
$new_confdsid = $setup->{inf}->{slapd}->{ServerIdentifier};
my $newinst = "slapd-$new_confdsid";
my $inf = createInfFromConfig("$instconfigdir/$newinst", $newinst);
if ( NULL == $inf )
{
$setup->msg($FATAL, 'error_create_inf_from_config',
"$instconfigdir/$newinst");
$setup->doExit(1);
}
if ( $orig_confdsid ne $new_confdsid )
{
# To switch to the new Config DS, unregister the old one
print("\n==============================================================================\n");
$setup->msg('unregister_old_confds', $orig_confdsid);
# If we don't have it, prompt for the Admin password
if (!$setup->{inf}->{General}->{ConfigDirectoryAdminPwd} ||
"" eq $setup->{inf}->{General}->{ConfigDirectoryAdminPwd})
{
$ans = reg_get_passwd($setup, 'input_admin_passwd', $adminuid);
$setup->{inf}->{General}->{ConfigDirectoryAdminPwd} = $ans;
}
while (!unregisterDSWithConfigDS($orig_confdsid, \@errs, $setup->{inf}))
{
$setup->msg($FATAL, 'error_unregister_ds', $orig_confdsid);
$ans = reg_get_passwd($setup, 'input_admin_passwd', $adminuid);
$setup->{inf}->{General}->{ConfigDirectoryAdminPwd} = $ans;
@errs = ();
}
# updating the port number
my $oldport = 0;
my $newport = $inf->{slapd}->{ServerPort};
($oldport = $setup->{inf}->{General}->{ldapurl}) =~ s/.*:([0-9]*)\/.*/\1/;
$setup->{inf}->{General}->{ldapurl} =~ s/$oldport/$newport/;
$setup->{inf}->{General}->{ConfigDirectoryLdapURL} = "ldap://" . $fqdn . ":". $newport . "/o=NetscapeRoot";
}
# Set the new inf to $setup->{inf}
$setup->{inf}->{slapd} = $inf->{slapd};
}
else
{
# Admin Server is not set up.
# @instances has more than one instance
# note: this is orig_confdsid is just a candidate...
($orig_confdsid = $instances[0]) =~ s/slapd-(.*)/\1/;
my $originst = "slapd-$orig_confdsid";
my $inf = createInfFromConfig("$instconfigdir/$originst", $originst);
if ( NULL == $inf )
{
$setup->msg($FATAL, 'error_create_inf_from_config',
"$instconfigdir/$originst");
$setup->doExit(1);
}
$setup->{inf} = $inf;
$setup->{inf}->{slapd}->{ServerIdentifier} = $orig_confdsid;
$setup->{inf}->{slapd}->{Instances} = \@instances;
my $dialogmgr = new DialogManager($setup, $res, $TYPICAL);
require RegDSDialogs;
require SetupDialogs;
require ConfigDSDialogs;
require ASDialogs;
my @dialogs = RegDSDialogs->getDialogs();
$dialogmgr->addDialog(@dialogs);
my $rc = $dialogmgr->run();
if ( $rc )
{
$setup->doExit(1);
}
$new_confdsid = $setup->{inf}->{slapd}->{ServerIdentifier};
if ( $orig_confdsid ne $new_confdsid )
{
my $newinst = "slapd-$new_confdsid";
$inf = createInfFromConfig("$instconfigdir/$newinst", $newinst);
if ( NULL == $inf )
{
$setup->msg($FATAL, 'error_create_inf_from_config',
"$instconfigdir/$newinst");
$setup->doExit(1);
}
$setup->{inf}->{slapd} = $inf->{slapd};
$setup->{inf}->{slapd}->{Instances} = \@instances;
}
$setup->{inf}->{General}->{ConfigDirectoryLdapURL} = "ldap://" . $fqdn . ":". $setup->{inf}->{slapd}->{ServerPort} . "/o=NetscapeRoot";
$dialogmgr->resetDialog();
@dialogs = SetupDialogs->getRegDialogs();
push @dialogs, ConfigDSDialogs->getRegDialogs();
push @dialogs, ASDialogs->getDialogs();
$dialogmgr->addDialog(@dialogs);
$rc = $dialogmgr->run();
if ( $rc )
{
$setup->doExit(1);
}
$adminuid = $setup->{inf}->{General}->{ConfigDirectoryAdminID};
}
# Get the ConfigDS's rootDN password
print("\n==============================================================================\n");
$setup->msg('register_new_confds', $new_confdsid);
$setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup,
'input_rootdn_passwd', $new_confdsid);
if ( ($#admConfKeys >= 0 && ($orig_confdsid ne $new_confdsid)) ||
$#admConfKeys < 0 )
{
@errs = ();
# First, let's register the Configuration Directory itself
while (!createConfigDS($setup->{inf}, \@errs))
{
foreach my $err (@errs)
{
if ( $err eq "suffix_already_exists" )
{
goto out;
}
}
$setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup,
'input_rootdn_passwd', $new_confdsid);
@errs = ();
}
out:
}
# If we don't have it, prompt for the Admin password
if (!$setup->{inf}->{General}->{ConfigDirectoryAdminPwd} ||
"" eq $setup->{inf}->{General}->{ConfigDirectoryAdminPwd})
{
$ans = reg_get_passwd($setup, 'input_admin_passwd', $adminuid);
$setup->{inf}->{General}->{ConfigDirectoryAdminPwd} = $ans;
}
@errs = ();
while (!registerDSWithConfigDS($new_confdsid, \@errs, $setup->{inf}))
{
$setup->msg($WARN, 'error_register_configds', $new_confdsid);
$ans = reg_get_passwd($setup, 'input_admin_passwd', $adminuid);
$setup->{inf}->{General}->{ConfigDirectoryAdminPwd} = $ans;
@errs = ();
}
my $hassubinst = 0;
# Then, register the rest of the Directory Servers, if any
my @subinstances = (); # array without the Config DS
foreach my $subinst (@instances)
{
if ( "$subinst" ne "slapd-" . $new_confdsid )
{
if ( 0 == $hassubinst )
{
$hassubinst = 1;
print("\n==============================================================================\n");
$setup->msg('register_subds');
}
my $subid = $subinst;
$subid =~ s/slapd-//;
push(@subinstances, ($subinst));
my $subinf = createInfFromConfig("$instconfigdir/$subinst", $subinst);
if ( NULL == $subinf )
{
$setup->msg($FATAL, 'error_create_inf_from_config',
"$subinstconfigdir/$subinst");
$setup->doExit(1);
}
$setup->{inf}->{slapd} = $subinf->{slapd};
$setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup,
'input_rootdn_passwd', $subid);
while (!createSubDS($setup->{inf}, \@errs))
{
$setup->msg($FATAL, @errs);
$setup->msg($FATAL, 'error_create_configds');
$setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup,
'input_rootdn_passwd', $subid);
}
}
}
if ( $#subinstances >= 0 )
{
@errs = ();
if ( !registerManyDSWithConfigDS($setup->{inf}, \@errs, $instconfigdir, @subinstances) )
{
$setup->msg($FATAL, @errs);
$setup->doExit(1);
}
}
# configure and register the admin server instance
# need these 3 values for ldapStart
$setup->{inf}->{slapd}->{ServerIdentifier} = $new_confdsid;
$setup->{inf}->{slapd}->{UseExistingMC} = "yes";
$setup->{inf}->{slapd}->{SlapdConfigForMC} = "yes";
if ( !$setup->{reconfigas} )
{
if ( !createAdminServer($setup) )
{
$setup->msg($FATAL, 'error_create_adminserver');
$setup->doExit(1);
}
}
else
{
if ( !reconfigAdminServer($setup) )
{
$setup->msg($FATAL, 'error_reconfig_adminserver');
$setup->doExit(1);
}
}
$setup->msg('end_ds_registration');
$setup->doExit(0);
--- NEW FILE register-ds-admin.res.in ---
begin_ds_registration = Beginning registration of the Directory Server
use_existing_configds_txt = Do you want to use this server as Configuration Directory Server?\n\n
unregister_old_confds = Cleaning up old Config DS: %s\n
register_new_confds = Registering new Config DS: %s\n
register_subds = Registering Sub DSes:
end_ds_registration = Finished registration of the Directory Server
input_rootdn_passwd = Please input the Directory Manager password on the server %s:
input_admin_uid = Please input the password for the Administrator User ID: [%s]
input_admin_passwd = Please input the password for the Administrator User %s:
input_userid = Please input the UNIX user id to run the server: [%s]
input_groupid = Please input the UNIX group id to run the server: [%s]
error_configds_txt = Error: the server ID %s does not exist. Choose server ID existing on the host.\n
error_opening_instconfdir = Error: could not open config dir %s: %s\n\nDirectory Servers may not be set up yet.\nPlease run setup-ds-admin.pl.\nNote: once you run setup-ds-admin.pl, the server is automatically registered.\n
error_no_ds = Error: could not find a Directory Server instance.\n\nDirectory Server may not be set up yet.\nPlease run setup-ds-admin.pl.\nNote: once you run setup-ds-admin.pl, the server is automatically registered.\n
error_create_inf_from_config = Error: could not retrieve necessary info from %s. Please check the file.\n
error_register_configds = Error: failed to register the configuration server info to the Configuration Directory Server %s.\n
error_register_subds = Error: failed to register the additional server info to the Configuration Directory Server %s.\n
error_unregister_ds = Error: failed to clean up the configuration info from the old Configuration\nDirectory Server %s.\n
error_connection_failed = Error: failed to open an LDAP connection.\n
Index: AdminServer.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminServer.pm.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AdminServer.pm.in 24 Jul 2007 20:10:16 -0000 1.7
+++ AdminServer.pm.in 27 Jul 2007 01:42:46 -0000 1.8
@@ -189,9 +189,9 @@
# This is how we extract the sie and isie as the as entries are
# being added
sub registercb {
- my ($context, $entry, $errs) = @_;
+ my ($context, $entry, $errs) = @_;
- my $rc = check_and_add_entry([$context->{conn}], $entry, $errs);
+ my $rc = check_and_add_entry([$context->{conn}, $context->{reconfig}], $entry, $errs);
my $setup = $context->{setup};
if ($rc) {
if ($entry->hasValue('objectclass', 'nsApplication', 1)) {
@@ -218,6 +218,7 @@
my $setup = shift;
my $inf = $setup->{inf};
my $configdir = shift;
+ my $reconfig = shift;
my @errs;
$setup->msg('registering_adminserver');
@@ -260,7 +261,7 @@
$setup->msg($FATAL, 'error_updating_localconf', $localconf, $!);
return 0;
}
- my $context = {conn => $conn, localfh => \*LOCALCONF, setup => $setup};
+ my $context = {conn => $conn, localfh => \*LOCALCONF, setup => $setup, reconfig => $reconfig};
getMappedEntries($mapper, \@ldiffiles, \@errs, \®istercb, $context);
close(LOCALCONF);
@@ -408,7 +409,7 @@
return 0;
}
- if (!registerASWithConfigDS($setup, $configdir)) {
+ if (!registerASWithConfigDS($setup, $configdir, $reconfig)) {
return 0;
}
Index: ConfigDSDialogs.pm
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ConfigDSDialogs.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConfigDSDialogs.pm 24 Jul 2007 20:10:16 -0000 1.5
+++ ConfigDSDialogs.pm 27 Jul 2007 01:42:46 -0000 1.6
@@ -167,6 +167,108 @@
['dialog_configdsinfo_ca_prompt']
);
+my $regconfigdsinfo = new Dialog (
+ $EXPRESS,
+ 'dialog_configdsinfo_text',
+ sub {
+ my $self = shift;
+ my $index = shift;
+ if ($index == 0) { # the url
+ my $url = $self->{manager}->{inf}->{General}->{ConfigDirectoryLdapURL};
+ if (!defined($url)) {
+ my $host = $self->{manager}->{inf}->{General}->{FullMachineName} ||
+ hostfqdn;
+ my $port = $self->{manager}->{inf}->{slapd}->{ServerPort} || 389;
+ if (!portAvailable($port)) {
+ $port = getAvailablePort();
+ }
+ my $suffix = "o=NetscapeRoot";
+ $url = "ldap://$host:$port/$suffix";
+ }
+ return $url;
+ } elsif ($index == 1) { # the id
+ return $self->{manager}->{inf}->{General}->{ConfigDirectoryAdminID} ||
+ "admin";
+ } elsif ($index == 2 || $index == 3) { # the password
+ return undef;
+ } elsif ($index == 4) { # admin domain
+ my $admindomain = $self->{manager}->{inf}->{General}->{AdminDomain};
+ if (!defined($admindomain)) {
+ $admindomain = $self->{manager}->{inf}->{General}->{FullMachineName} ||
+ hostfqdn;
+ $admindomain =~ s/^[^\.]*\.//; # just the domain part
+ }
+ return $admindomain;
+ } else { # the CA cert
+ my $url = $self->{manager}->{inf}->{General}->{ConfigDirectoryLdapURL};
+ my $cert = $self->{manager}->{inf}->{General}->{CACertificate};
+ if (($url !~ /^ldaps/) or $self->{manager}->{inf}->{General}->{certdb} or
+ ($cert =~ /^-----BEGIN CERTIFICATE-----/)) {
+ # not using LDAPS, or already have a certdb - hide CA prompt
+ $self->{prompts}->[5]->[2] = 1;
+ } else {
+ $self->{prompts}->[5]->[2] = 0; # unhide CA prompt
+ }
+ return $self->{manager}->{inf}->{General}->{CACertificate};
+ }
+ },
+ sub {
+ my $self = shift;
+ my $ans = shift;
+ my $index = shift;
+
+ my $res = $DialogManager::SAME;
+ if ($index == 0) {
+ # validate URL?
+ $self->{manager}->{inf}->{General}->{ConfigDirectoryLdapURL} = $ans;
+ my $url = $self->{manager}->{inf}->{General}->{ConfigDirectoryLdapURL};
+ if (($url !~ /^ldaps/) or $self->{manager}->{inf}->{General}->{certdb}) {
+ # not using LDAPS, or already have a certdb - hide CA prompt
+ $self->{prompts}->[5]->[2] = 1;
+ } else {
+ $self->{prompts}->[5]->[2] = 0; # unhide CA prompt
+ }
+ $res = $DialogManager::NEXT;
+ } elsif ($index == 1) { # id
+ $self->{manager}->{inf}->{General}->{ConfigDirectoryAdminID} = $ans;
+ $res = $DialogManager::NEXT;
+ } elsif ($index == 2) { # pwd
+ my $test = $ans;
+ if ($test) {
+ $test =~ s/\s//g;
+ }
+ if (!$ans or (length($test) != length($ans))) {
+ $self->{manager}->alert("dialog_configdsadmin_invalid");
+ } else {
+ $self->{firstpassword} = $ans; # save for next index
+ $res = $DialogManager::NEXT;
+ }
+ } elsif ($index == 3) { # verify second password
+ if ($ans ne $self->{firstpassword}) {
+ $self->{manager}->alert("dialog_configdsadmin_nomatch");
+ } else {
+ $self->{manager}->{inf}->{General}->{ConfigDirectoryAdminPwd} = $ans;
+ $res = $DialogManager::NEXT;
+ }
+ } elsif ($index == 4) { # admin domain
+ $self->{manager}->{inf}->{General}->{AdminDomain} = $ans;
+ $res = $DialogManager::NEXT;
+ } else { # CA cert filename
+ if ($ans && length($ans) &&
+ ($ans !~ /^-----BEGIN CERTIFICATE-----/) && ! -f $ans) {
+ $self->{manager}->alert("dialog_configdsinfo_ca_error", $ans);
+ } else {
+ $self->{manager}->{inf}->{General}->{CACertificate} = $ans;
+ $res = $DialogManager::NEXT;
+ }
+ }
+ return $res;
+ },
+ ['dialog_configdsinfo_url_prompt'], ['dialog_configdsinfo_id_prompt'],
+ ['dialog_configdsinfo_pwd_prompt', 1], ['dialog_configdsinfo_pwd2_prompt', 1],
+ ['dialog_configdsinfo_domain_prompt', 0, 0], ['dialog_configdsinfo_ca_prompt']
+);
+
my $configdsadmin = new Dialog (
$EXPRESS,
'dialog_configdsadmin_text',
@@ -311,4 +413,8 @@
return ($useconfigds, $configdsinfo, $configdsadmin, $configdsadmindomain);
}
+sub getRegDialogs {
+ return ($regconfigdsinfo, $configdsadmindomain);
+}
+
1;
Index: setup-ds-admin.res.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.res.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- setup-ds-admin.res.in 13 Jul 2007 18:39:15 -0000 1.5
+++ setup-ds-admin.res.in 27 Jul 2007 01:42:46 -0000 1.6
@@ -46,6 +46,7 @@
dialog_configdsinfo_url_prompt = Configuration directory server URL
dialog_configdsinfo_id_prompt = Configuration directory server admin ID
dialog_configdsinfo_pwd_prompt = Configuration directory server admin password
+dialog_configdsinfo_pwd2_prompt = Configuration directory server admin password (confirm)
dialog_configdsinfo_domain_prompt = Configuration directory server admin domain
dialog_configdsinfo_ca_prompt = CA certificate filename
dialog_configdsinfo_ca_error = '%s' is not a valid CA certificate file. Please choose another one.\n\n
@@ -57,7 +58,7 @@
dialog_configdsadmin_text = Please enter the administrator ID for the configuration directory\nserver. This is the ID typically used to log in to the console. You\nwill also be prompted for the password.\n\n
dialog_configdsadmin_prompt = Configuration directory server\nadministrator ID
dialog_configdsadmin_pw1_prompt = Password
-dialog_configdsadmin_pw2_prompt = Password (again)
+dialog_configdsadmin_pw2_prompt = Password (confirm)
dialog_configdsadmin_error = The input '%s' is not a valid ID. Please choose another one.\n\n
dialog_configdsadmin_invalid = The password contains invalid characters. Please choose another one.\n\n
dialog_configdsadmin_nomatch = The passwords do not match. Please try again.\n\n
From fedora-directory-commits at redhat.com Fri Jul 27 01:46:12 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 26 Jul 2007 21:46:12 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
DialogManager.pm, 1.4, 1.5 SetupDialogs.pm.in, 1.2,
1.3 setup-ds.res.in, 1.8, 1.9
Message-ID: <200707270146.l6R1kCSn021223@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21095
Modified Files:
DialogManager.pm SetupDialogs.pm.in setup-ds.res.in
Log Message:
Resolves: #249739
Summary: Implement a script registering DS to the Configuration DS (comment#5)
Index: DialogManager.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DialogManager.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DialogManager.pm 20 Jun 2007 16:27:50 -0000 1.4
+++ DialogManager.pm 27 Jul 2007 01:46:10 -0000 1.5
@@ -89,6 +89,11 @@
}
}
+sub resetDialog {
+ my $self = shift;
+ @{$self->{dialogs}} = ();
+}
+
# see if the user answered with the special BACK answer
sub isBack {
my $self = shift;
Index: SetupDialogs.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/SetupDialogs.pm.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetupDialogs.pm.in 13 Jul 2007 19:51:48 -0000 1.2
+++ SetupDialogs.pm.in 27 Jul 2007 01:46:10 -0000 1.3
@@ -253,4 +253,8 @@
return ($welcome, $license, $setuptype, $hostdlg, $usergroup);
}
+sub getRegDialogs {
+ return ($usergroup);
+}
+
1;
Index: setup-ds.res.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.res.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- setup-ds.res.in 13 Jul 2007 18:35:32 -0000 1.8
+++ setup-ds.res.in 27 Jul 2007 01:46:10 -0000 1.9
@@ -66,7 +66,7 @@
dialog_dsrootdn_prompt = Directory Manager DN
dialog_dsrootdn_error = The input '%s' is not a valid DN. Please choose another one.\n\n
dialog_dsrootpw_prompt1 = Password
-dialog_dsrootpw_prompt2 = Password (again)
+dialog_dsrootpw_prompt2 = Password (confirm)
dialog_dsrootpw_invalid = The password contains invalid characters. Please choose another one.\n\n
dialog_dsrootpw_tooshort = The password must be at least %s characters long. Please choose another one.\n\n
dialog_dsrootpw_nomatch = The passwords do not match. Please try again.\n\n
From fedora-directory-commits at redhat.com Fri Jul 27 20:30:01 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 27 Jul 2007 16:30:01 -0400
Subject: [Fedora-directory-commits] console fedora-idm-console, NONE,
1.1 fedora-idm-console.spec, NONE, 1.1 build.properties, 1.12,
1.13 build.xml, 1.15, 1.16 fedora-console, 1.1,
NONE fedora-console.spec, 1.3, NONE
Message-ID: <200707272030.l6RKU1dt005665@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5556
Modified Files:
build.properties build.xml
Added Files:
fedora-idm-console fedora-idm-console.spec
Removed Files:
fedora-console fedora-console.spec
Log Message:
Resolves: 249897
Summary: Changed package name to fedora-idm-console.
--- NEW FILE fedora-idm-console ---
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
# 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
# END COPYRIGHT BLOCK
JAVA=`which java`
if [ -z "$JAVA" -o ! -x "$JAVA" ]
then
echo "$0: The java program is not in your path, or is not executable.";
exit 1
fi
CLASSDEST=@classdest@
#
# Launch the Console
#
java -ms8m -mx64m -cp @jssjar@:@ldapjdkjar@:$CLASSDEST/@basejar@:$CLASSDEST/@mccjar@:$CLASSDEST/@mcclangjar@:$CLASSDEST/@nmclfjar@:$CLASSDEST/@nmclflangjar@:$CLASSDEST/@themejar@ -Djava.library.path=@libdir@ -Djava.util.prefs.systemRoot="$HOME/. at prefsdir@" -Djava.util.prefs.userRoot="$HOME/. at prefsdir@" com.netscape.management.client.console.Console $*
--- NEW FILE fedora-idm-console.spec ---
%define major_version 1.1
%define minor_version 0
Name: fedora-idm-console
Version: %{major_version}.%{minor_version}
Release: 3
Group: Applications
Vendor: Fedora Project
URL: http://directory.fedora.redhat.com
License: LGPL
Packager: Red Hat, Inc.
Summary: Fedora Management Console
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildArch: noarch
Source: %{name}-%{version}.tar.gz
Autoreq: 0
AutoReqProv: no
Requires: %{name}-framework >= %{version}
BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, jss >= 4.2
%description
A Java based remote management console used for Managing Fedora
Administration Server and Fedora Directory Server.
# prep and setup expect there to be a Source file
# in the /usr/src/redhat/SOURCES directory - it will be unpacked
# in the _builddir (not BuildRoot)
%package framework
Summary: Fedora Management Console Framework
Requires: ldapjdk >= 4.18, jss >= 4.2
Group: System Environment/Libraries
%description framework
A Java Management Console framework used for remote server management.
%prep
%setup -q
%build
cd console
ant -Dlib.dir=%{_libdir}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/usr/share/java
install -m777 built/release/jars/fedora-* $RPM_BUILD_ROOT/usr/share/java
install -d $RPM_BUILD_ROOT/usr/bin
install -m777 built/release/%{name} $RPM_BUILD_ROOT/usr/bin
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
/usr/share/java/%{name}-%{version}_en.jar
/usr/bin/%{name}
%files framework
%defattr(-,root,root)
/usr/share/java/%{name}-base-%{version}.jar
/usr/share/java/fedora-mcc-%{version}.jar
/usr/share/java/fedora-mcc-%{version}_en.jar
/usr/share/java/fedora-nmclf-%{version}.jar
/usr/share/java/fedora-nmclf-%{version}_en.jar
%post
cd /usr/share/java
ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar
ln -s %{name}-%{version}_en.jar %{name}_en.jar
%post framework
cd /usr/share/java
ln -s %{name}-base-%{version}.jar %{name}-base-%{major_version}.jar
ln -s %{name}-base-%{version}.jar %{name}-base.jar
ln -s fedora-mcc-%{version}.jar fedora-mcc-%{major_version}.jar
ln -s fedora-mcc-%{version}.jar fedora-mcc.jar
ln -s fedora-mcc-%{version}_en.jar fedora-mcc-%{major_version}_en.jar
ln -s fedora-mcc-%{version}_en.jar fedora-mcc_en.jar
ln -s fedora-nmclf-%{version}.jar fedora-nmclf-%{major_version}.jar
ln -s fedora-nmclf-%{version}.jar fedora-nmclf.jar
ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf-%{major_version}_en.jar
ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf_en.jar
%preun
rm -rf /usr/share/java/%{name}-%{major_version}_en.jar
rm -rf /usr/share/java/%{name}_en.jar
%preun framework
rm -rf /usr/share/java/%{name}-base-%{major_version}.jar
rm -rf /usr/share/java/%{name}-base.jar
rm -rf /usr/share/java/fedora-mcc-%{major_version}.jar
rm -rf /usr/share/java/fedora-mcc.jar
rm -rf /usr/share/java/fedora-mcc-%{major_version}_en.jar
rm -rf /usr/share/java/fedora-mcc_en.jar
rm -rf /usr/share/java/fedora-nmclf-%{major_version}.jar
rm -rf /usr/share/java/fedora-nmclf.jar
rm -rf /usr/share/java/fedora-nmclf-%{major_version}_en.jar
rm -rf /usr/share/java/fedora-nmclf_en.jar
%changelog
* Fri Jul 27 2007 Nathan Kinder 1.1.0-3
- Changed package name to be less generic.
* Thu Jul 26 2007 Nathan Kinder 1.1.0-2
- Updated start script and theme jar names. Fixed post and
preun steps for framework subpackage.
* Fri Jun 29 2007 Nathan Kinder 1.1.0-1
- Updated for 1.1.0 release
* Mon Nov 14 2005 Nathan Kinder 1.0-1
- Initial creation
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.properties 26 Jul 2007 23:08:46 -0000 1.12
+++ build.properties 27 Jul 2007 20:29:59 -0000 1.13
@@ -36,11 +36,11 @@
nmclf.name=${nmclf.core}-${console.dotversion}
nmclf.gen.name=${nmclf.core}-${console.dotgenversion}
-base.core=${console.brand}-base
+base.core=${console.brand}-idm-console-base
base.name=${base.core}-${console.dotversion}
base.gen.name=${base.core}-${console.dotgenversion}
-theme.core=${console.brand}-console
+theme.core=${console.brand}-idm-console
theme.name=${theme.core}-${console.dotversion}
theme.gen.name=${theme.core}-${console.dotgenversion}
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 26 Jul 2007 23:08:46 -0000 1.15
+++ build.xml 27 Jul 2007 20:29:59 -0000 1.16
@@ -184,9 +184,9 @@
-
-
-
+
+
+
--- fedora-console DELETED ---
--- fedora-console.spec DELETED ---
From fedora-directory-commits at redhat.com Fri Jul 27 20:30:02 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 27 Jul 2007 16:30:02 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/theme
theme.properties, 1.4, 1.5
Message-ID: <200707272030.l6RKU21Q005672@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/theme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5556/src/com/netscape/management/client/theme
Modified Files:
theme.properties
Log Message:
Resolves: 249897
Summary: Changed package name to fedora-idm-console.
Index: theme.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/theme/theme.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- theme.properties 26 Jul 2007 23:08:49 -0000 1.4
+++ theme.properties 27 Jul 2007 20:29:59 -0000 1.5
@@ -20,7 +20,7 @@
console-title=Fedora Management Console
console-useragent=Fedora-Management-Console
-console-prefsdir=.fedora-console
+console-prefsdir=.fedora-idm-console
login-title=Fedora Management Console Login
banner-console=Fedora Management Console
From fedora-directory-commits at redhat.com Mon Jul 30 17:16:43 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 30 Jul 2007 13:16:43 -0400
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv DSAdmin.java,
1.5, 1.6 about.properties, 1.4, 1.5 dirserv.properties, 1.6, 1.7
Message-ID: <200707301716.l6UHGhwv002936@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2901/src/com/netscape/admin/dirserv
Modified Files:
DSAdmin.java about.properties dirserv.properties
Log Message:
Resolves: 250137
Summary: Updated verison number to 1.1.0
Index: DSAdmin.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DSAdmin.java 11 Jul 2007 01:26:23 -0000 1.5
+++ DSAdmin.java 30 Jul 2007 17:16:40 -0000 1.6
@@ -1267,7 +1267,7 @@
static public int SECURITY_ENABLE = 2;
// Minimum required console version
- private static final float MINIMUM_VERSION = 1.0f;
+ private static final float MINIMUM_VERSION = 1.1f;
// Icon for the console
private static final String _imageName = "directory.gif";
Index: about.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/about.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- about.properties 29 Sep 2006 17:17:26 -0000 1.4
+++ about.properties 30 Jul 2007 17:16:40 -0000 1.5
@@ -19,7 +19,7 @@
#
# Strings and logos used by the DSAboutDialog
-aboutDialog-dialogTitle=Fedora Directory Server 1.0.3
+aboutDialog-dialogTitle=Fedora Directory Server 1.1.0
aboutDialog-productLogo=com/netscape/management/client/images/logo32.gif
aboutDialog-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2005 Red Hat, Inc.\nAll rights reserved.
aboutDialog-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.
Index: dirserv.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/dirserv.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dirserv.properties 2 Jul 2007 19:44:08 -0000 1.6
+++ dirserv.properties 30 Jul 2007 17:16:40 -0000 1.7
@@ -164,9 +164,9 @@
#
dialog-configtitle=Fedora Directory Server
dsAdmin-title=Fedora Directory Server
-dsAdmin-version=Version 1.0.3
+dsAdmin-version=Version 1.1.0
dsAdmin-nsServerPort=Port
-dsAdmin-framework-description=Fedora Directory Server Console 1.0.3
+dsAdmin-framework-description=Fedora Directory Server Console 1.1.0
dsAdmin-remove-server-cgi-failed=ds_remove failure
#
@@ -1736,12 +1736,12 @@
encryption-nosslfamily-msg=At least one cipher family must be selected to enable SSL
encryption-nosslfamily-title=Invalid SSL settings
encryption-preferences-title=Encryption Preferences
-encryption-consoleSSL-label=Use SSL in Fedora Console
-encryption-consoleSSL-ttip=Use SSL for connections from Fedora Console to this server
+encryption-consoleSSL-label=Use SSL in Console
+encryption-consoleSSL-ttip=Use SSL for connections from Console to this server
encryption-SSLCheckHostName-label=Check hostname against name in certificate for outbound SSL connections
encryption-SSLCheckHostName-ttip=Check the hostname used for outbound SSL connections against the name in the destination server's certificate
encryption-confirm-clientauth-title=Require Client Authentication
-encryption-confirm-clientauth-msg=When the server is configured to require SSL client authentication,\nFedora Console cannot use SSL to manage the server.\nIt will use a regular LDAP connection.
+encryption-confirm-clientauth-msg=When the server is configured to require SSL client authentication,\nConsole cannot use SSL to manage the server.\nIt will use a regular LDAP connection.
encryption-confirm-sslport-title=Encrypted Port Checking
encryption-confirm-sslport-msg=The encrypted port is %0. On Unix, using a port\nbelow 1024 requires the server to be installed as root.\n\nBefore restarting the server, make sure it was installed\nas root or set a port above 1024 using the Settings tab.
@@ -2390,7 +2390,7 @@
general-ldapv2quoting-title=Using Deprecated LDAPv2 Style Quoting
general-ldapv2quoting-msg=The field %0 has the value %1 which uses the deprecated\nLDAPv2 style quoting. It will be converted to use LDAPv3 escapes.
general-neednewconsole-title=Console Version Mismatch
-general-neednewconsole-msg=This Directory Server Console is not compatible with Admin Console version %0.\nPlease install the latest Admin Console or download the components from the Fedora web server.
+general-neednewconsole-msg=This Directory Server is not compatible with the Console version you are running (%0).\nPlease install the latest Console.
general-notyetimplemented=Not Yet Implemented!
general-backendname-exist-msg=Database named %0 already exists
general-backendname-exist-title=Error on creation
@@ -2686,7 +2686,7 @@
mappingtree-referral-LDAPUrl-no-good-title=Confirmation Needed
mappingtree-referral-LDAPUrl-no-good-msg=This URL is not compliant with the Standard LDAP URL format.\nIf your LDAP client understands a non standard format,\nclick YES to add it to the list.
mappingtree-multiple-db-title=Warning
-mappingtree-multiple-db-msg= You have chosen to distribute a single suffix across multiple databases.\n This requires configuring distribution logic with Fedora Professional Services.\n In addition, you cannot replicate a suffix distributed across multiple databases.\n Do you want to continue?
+mappingtree-multiple-db-msg= You have chosen to distribute a single suffix across multiple databases.\n This requires a custom distribution logic plugin.\n In addition, you cannot replicate a suffix distributed across multiple databases.\n Do you want to continue?
mappingtree-reload-suffix-title=Error Reading Suffix
mappingtree-reload-suffix-msg=Failed to read %0\n Error: %1
mappingtree-del-warning-title=Database Successfully Deleted
From fedora-directory-commits at redhat.com Mon Jul 30 17:16:43 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 30 Jul 2007 13:16:43 -0400
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv/panel
MappingUtils.java, 1.1.1.1, 1.2
Message-ID: <200707301716.l6UHGh0w002942@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2901/src/com/netscape/admin/dirserv/panel
Modified Files:
MappingUtils.java
Log Message:
Resolves: 250137
Summary: Updated verison number to 1.1.0
Index: MappingUtils.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/MappingUtils.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- MappingUtils.java 18 Jul 2005 00:56:00 -0000 1.1.1.1
+++ MappingUtils.java 30 Jul 2007 17:16:41 -0000 1.2
@@ -493,9 +493,9 @@
/**
* Returns the suffix of the backend that is naming context and parent of the entry.
- * For example if we have 2 backends with suffixes 'o=fedora.com' and 'ou=people, o=fedora.com'
- * For 'cn=Michael, o=fedora.com' it will return 'o=fedora.com'
- * For 'cn=Michael, ou=people, o=fedora.com' it will return 'o=fedora.com' ('ou=people, o=fedora.com' is not a naming context)
+ * For example if we have 2 backends with suffixes 'o=example.com' and 'ou=people, o=example.com'
+ * For 'cn=Michael, o=example.com' it will return 'o=example.com'
+ * For 'cn=Michael, ou=people, o=example.com' it will return 'o=example.com' ('ou=people, o=example.com' is not a naming context)
* For 'cn=plugins, cn=config' (not in a regular backend) it will return null
*/
public static String getTopSuffixForEntry(LDAPConnection ldc, String dn) {
@@ -522,9 +522,9 @@
/**
* This method gets the shortest suffix which is superior of the given dn from the given suffix list .
- * For example if we have a list with 2 suffixes 'o=fedora.com' and 'ou=people, o=fedora.com'
- * For 'cn=Michael, o=fedora.com' it will return 'o=fedora.com'
- * For 'cn=Michael, ou=people, o=fedora.com' it will return 'o=fedora.com'
+ * For example if we have a list with 2 suffixes 'o=example.com' and 'ou=people, o=example.com'
+ * For 'cn=Michael, o=example.com' it will return 'o=example.com'
+ * For 'cn=Michael, ou=people, o=example.com' it will return 'o=example.com'
* For 'cn=plugins, cn=config' (not in the list of suffixes) it will return null
*
* @param dn of the entry we want to handle
@@ -555,9 +555,9 @@
/**
* Returns the suffix of the backend to which this entry belongs.
- * For example if we have 2 backends with suffixes 'o=fedora.com' and 'ou=people, o=fedora.com'
- * For 'cn=Michael, o=fedora.com' it will return 'o=fedora.com'
- * For 'cn=Michael, ou=people, o=fedora.com' it will return 'ou=people, o=fedora.com'
+ * For example if we have 2 backends with suffixes 'o=example.com' and 'ou=people, o=example.com'
+ * For 'cn=Michael, o=example.com' it will return 'o=example.com'
+ * For 'cn=Michael, ou=people, o=example.com' it will return 'ou=people, o=example.com'
* For 'cn=plugins, cn=config' (not in a regular backend) it will return null
*/
From fedora-directory-commits at redhat.com Mon Jul 30 18:10:11 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon, 30 Jul 2007 14:10:11 -0400
Subject: [Fedora-directory-commits] directoryconsole build.xml, 1.8,
1.9 fedora-ds-console.spec, 1.1, 1.2
Message-ID: <200707301810.l6UIABid017300@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17231
Modified Files:
build.xml fedora-ds-console.spec
Log Message:
Resolves: 250145
Summary: Updated dependency on fedora-idm-console.
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 2 Jul 2007 19:44:08 -0000 1.8
+++ build.xml 30 Jul 2007 18:10:08 -0000 1.9
@@ -82,9 +82,9 @@
-
-
-
+
+
+
Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/dirsec/directoryconsole/fedora-ds-console.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-ds-console.spec 2 Jul 2007 19:47:55 -0000 1.1
+++ fedora-ds-console.spec 30 Jul 2007 18:10:08 -0000 1.2
@@ -3,7 +3,7 @@
Name: fedora-ds-console
Version: %{major_version}.%{minor_version}
-Release: 1
+Release: 2
Group: Applications
Vendor: Fedora Project
URL: http://directory.fedora.redhat.com
@@ -15,7 +15,7 @@
Source: %{name}-%{version}.tar.gz
Autoreq: 0
AutoReqProv: no
-BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, fedora-console-framework >= 1.1
+BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, fedora-idm-console-framework >= 1.1
%description
A Java based remote management console used for Managing Fedora
@@ -58,5 +58,8 @@
rm -rf /usr/share/java/fedora-ds_en.jar
%changelog
+* Mon Jul 30 2007 Nathan Kinder 1.1.0-2
+- Updated requirements.
+
* Mon Nov 14 2005 Nathan Kinder 1.1.0-1
- Initial creation
From fedora-directory-commits at redhat.com Mon Jul 30 23:13:50 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 30 Jul 2007 19:13:50 -0400
Subject: [Fedora-directory-commits] adminserver configure.ac, 1.12,
1.13 config.h.in, 1.5, 1.6 aclocal.m4, 1.18, 1.19 configure,
1.21, 1.22 missing, 1.11, 1.12 install-sh, 1.11, 1.12 compile,
1.10, 1.11 Makefile.in, 1.24, 1.25 depcomp, 1.11,
1.12 config.sub, 1.11, 1.12 config.guess, 1.11, 1.12
Message-ID: <200707302313.l6UNDo6p021539@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21509
Modified Files:
configure.ac config.h.in aclocal.m4 configure missing
install-sh compile Makefile.in depcomp config.sub config.guess
Log Message:
remove AC_FUNC_REALLOC - breaks build in HPUX
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- configure.ac 26 Jun 2007 18:34:46 -0000 1.12
+++ configure.ac 30 Jul 2007 23:13:45 -0000 1.13
@@ -45,7 +45,6 @@
AC_FUNC_MALLOC
AC_FUNC_MEMCMP
AC_FUNC_MMAP
-AC_FUNC_REALLOC
AC_TYPE_SIGNAL
AC_FUNC_STAT
AC_FUNC_STRERROR_R
Index: config.h.in
===================================================================
RCS file: /cvs/dirsec/adminserver/config.h.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.h.in 25 Jun 2007 23:23:10 -0000 1.5
+++ config.h.in 30 Jul 2007 23:13:45 -0000 1.6
@@ -103,10 +103,6 @@
/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
-/* Define to 1 if your system has a GNU libc compatible `realloc' function,
- and to 0 otherwise. */
-#undef HAVE_REALLOC
-
/* Define to 1 if you have the `rmdir' function. */
#undef HAVE_RMDIR
@@ -339,9 +335,6 @@
/* Define to `int' if does not define. */
#undef pid_t
-/* Define to rpl_realloc if the replacement function should be used. */
-#undef realloc
-
/* Define to `unsigned' if does not define. */
#undef size_t
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/aclocal.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- aclocal.m4 11 Jul 2007 01:20:21 -0000 1.18
+++ aclocal.m4 30 Jul 2007 23:13:45 -0000 1.19
@@ -1578,10 +1578,27 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -4288,6 +4305,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4421,11 +4441,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4437,7 +4457,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4517,7 +4537,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6353,6 +6373,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6385,6 +6406,7 @@
done
])
SED=$lt_cv_path_SED
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure 11 Jul 2007 01:20:21 -0000 1.21
+++ configure 30 Jul 2007 23:13:45 -0000 1.22
@@ -468,7 +468,7 @@
ac_default_prefix=/opt/fedora-ds
ac_subdirs_all="$ac_subdirs_all mod_admserv"
ac_subdirs_all="$ac_subdirs_all mod_restartd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -3832,6 +3832,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3866,6 +3867,7 @@
fi
SED=$lt_cv_path_SED
+
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -4306,7 +4308,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4309 "configure"' > conftest.$ac_ext
+ echo '#line 4311 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5441,7 +5443,7 @@
# Provide some information about the compiler.
-echo "$as_me:5444:" \
+echo "$as_me:5446:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6504,11 +6506,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6507: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6509: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6511: \$? = $ac_status" >&5
+ echo "$as_me:6513: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6772,11 +6774,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6775: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6777: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6779: \$? = $ac_status" >&5
+ echo "$as_me:6781: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6876,11 +6878,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6879: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6881: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6883: \$? = $ac_status" >&5
+ echo "$as_me:6885: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8341,10 +8343,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 8350 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9221,7 +9244,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11690: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11668: \$? = $ac_status" >&5
+ echo "$as_me:11694: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11765,11 +11791,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11768: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11794: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11772: \$? = $ac_status" >&5
+ echo "$as_me:11798: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12297,10 +12323,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 12330 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12684,6 +12731,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -12817,11 +12867,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_CXX
+predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_CXX
+postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -12833,7 +12883,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12913,7 +12963,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13335,11 +13385,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13338: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13388: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13342: \$? = $ac_status" >&5
+ echo "$as_me:13392: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13439,11 +13489,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13442: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13492: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13446: \$? = $ac_status" >&5
+ echo "$as_me:13496: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14884,10 +14934,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 14941 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15271,6 +15342,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -15404,11 +15478,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_F77
+predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_F77
+postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -15420,7 +15494,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -15500,7 +15574,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15642,11 +15716,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15645: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15719: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15649: \$? = $ac_status" >&5
+ echo "$as_me:15723: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15910,11 +15984,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15913: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15987: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15917: \$? = $ac_status" >&5
+ echo "$as_me:15991: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16014,11 +16088,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16017: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16091: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16021: \$? = $ac_status" >&5
+ echo "$as_me:16095: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17479,10 +17553,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 17560 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17866,6 +17961,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -17999,11 +18097,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_GCJ
+predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
+postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18015,7 +18113,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18095,7 +18193,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18347,6 +18445,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18480,11 +18581,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_RC
+predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_RC
+postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18496,7 +18597,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18576,7 +18677,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -21837,237 +21938,6 @@
fi
rm -f conftest.mmap
-
-for ac_header in stdlib.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to http://bugzilla.redhat.com/ ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5
-echo $ECHO_N "checking for GNU libc compatible realloc... $ECHO_C" >&6
-if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_realloc_0_nonnull=no
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if STDC_HEADERS || HAVE_STDLIB_H
-# include
-#else
-char *realloc ();
-#endif
-
-int
-main ()
-{
-exit (realloc (0, 0) ? 0 : 1);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_realloc_0_nonnull=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_realloc_0_nonnull=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5
-echo "${ECHO_T}$ac_cv_func_realloc_0_nonnull" >&6
-if test $ac_cv_func_realloc_0_nonnull = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_REALLOC 1
-_ACEOF
-
-else
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_REALLOC 0
-_ACEOF
-
- case $LIBOBJS in
- "realloc.$ac_objext" | \
- *" realloc.$ac_objext" | \
- "realloc.$ac_objext "* | \
- *" realloc.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS realloc.$ac_objext" ;;
-esac
-
-
-cat >>confdefs.h <<\_ACEOF
-#define realloc rpl_realloc
-_ACEOF
-
-fi
-
-
-
echo "$as_me:$LINENO: checking return type of signal handlers" >&5
echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
if test "${ac_cv_type_signal+set}" = set; then
@@ -25844,6 +25714,7 @@
s, at CCDEPMODE@,$CCDEPMODE,;t t
s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s, at SED@,$SED,;t t
s, at EGREP@,$EGREP,;t t
s, at LN_S@,$LN_S,;t t
s, at ECHO@,$ECHO,;t t
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.in 27 Jul 2007 01:42:46 -0000 1.24
+++ Makefile.in 30 Jul 2007 23:13:45 -0000 1.25
@@ -394,6 +394,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
From fedora-directory-commits at redhat.com Mon Jul 30 23:32:35 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 30 Jul 2007 19:32:35 -0400
Subject: [Fedora-directory-commits] console fedora-idm-console.spec,1.1,1.2
Message-ID: <200707302332.l6UNWZ4S023935@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23909
Modified Files:
fedora-idm-console.spec
Log Message:
Resolves: bug 250178
Description: console: Spec file cleanup in prep for Fedora package review
Fix Description: See http://fedoraproject.org/wiki/Packaging/Guidelines
Reviewed by: nkinder (Thanks!)
Index: fedora-idm-console.spec
===================================================================
RCS file: /cvs/dirsec/console/fedora-idm-console.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-idm-console.spec 27 Jul 2007 20:29:59 -0000 1.1
+++ fedora-idm-console.spec 30 Jul 2007 23:32:33 -0000 1.2
@@ -3,32 +3,29 @@
Name: fedora-idm-console
Version: %{major_version}.%{minor_version}
-Release: 3
+Release: 4
+Summary: Fedora Management Console
+
Group: Applications
-Vendor: Fedora Project
-URL: http://directory.fedora.redhat.com
License: LGPL
-Packager: Red Hat, Inc.
-Summary: Fedora Management Console
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+URL: http://directory.fedora.redhat.com
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Source: %{name}-%{version}.tar.gz
-Autoreq: 0
-AutoReqProv: no
+Source: %{name}-%{version}.tar.bz2
Requires: %{name}-framework >= %{version}
-BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, jss >= 4.2
+BuildRequires: ant >= 1.6.2
+BuildRequires: ldapjdk
+BuildRequires: jss >= 4.2
%description
A Java based remote management console used for Managing Fedora
Administration Server and Fedora Directory Server.
-# prep and setup expect there to be a Source file
-# in the /usr/src/redhat/SOURCES directory - it will be unpacked
-# in the _builddir (not BuildRoot)
-
%package framework
Summary: Fedora Management Console Framework
-Requires: ldapjdk >= 4.18, jss >= 4.2
+BuildRequires: ldapjdk
+BuildRequires: jss >= 4.2
Group: System Environment/Libraries
%description framework
@@ -36,41 +33,24 @@
%prep
%setup -q
-
+
%build
-cd console
-ant -Dlib.dir=%{_libdir}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/share/java
-install -m777 built/release/jars/fedora-* $RPM_BUILD_ROOT/usr/share/java
-install -d $RPM_BUILD_ROOT/usr/bin
-install -m777 built/release/%{name} $RPM_BUILD_ROOT/usr/bin
+%{ant} \
+ -Dlib.dir=%{_libdir} \
+ -Dbuilt.dir=`pwd`/built \
+ -Dclassdest=%{_javadir}
-%clean
+%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_javadir}
+install -m777 built/release/jars/fedora-* $RPM_BUILD_ROOT%{_javadir}
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -m777 built/release/%{name} $RPM_BUILD_ROOT%{_bindir}
-%files
-%defattr(-,root,root)
-/usr/share/java/%{name}-%{version}_en.jar
-/usr/bin/%{name}
-
-%files framework
-%defattr(-,root,root)
-/usr/share/java/%{name}-base-%{version}.jar
-/usr/share/java/fedora-mcc-%{version}.jar
-/usr/share/java/fedora-mcc-%{version}_en.jar
-/usr/share/java/fedora-nmclf-%{version}.jar
-/usr/share/java/fedora-nmclf-%{version}_en.jar
-
-%post
-cd /usr/share/java
+# create symlinks
+pushd $RPM_BUILD_ROOT%{_javadir}
ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar
ln -s %{name}-%{version}_en.jar %{name}_en.jar
-
-%post framework
-cd /usr/share/java
ln -s %{name}-base-%{version}.jar %{name}-base-%{major_version}.jar
ln -s %{name}-base-%{version}.jar %{name}-base.jar
ln -s fedora-mcc-%{version}.jar fedora-mcc-%{major_version}.jar
@@ -81,24 +61,40 @@
ln -s fedora-nmclf-%{version}.jar fedora-nmclf.jar
ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf-%{major_version}_en.jar
ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf_en.jar
+popd
+
+%clean
+rm -rf $RPM_BUILD_ROOT
-%preun
-rm -rf /usr/share/java/%{name}-%{major_version}_en.jar
-rm -rf /usr/share/java/%{name}_en.jar
-
-%preun framework
-rm -rf /usr/share/java/%{name}-base-%{major_version}.jar
-rm -rf /usr/share/java/%{name}-base.jar
-rm -rf /usr/share/java/fedora-mcc-%{major_version}.jar
-rm -rf /usr/share/java/fedora-mcc.jar
-rm -rf /usr/share/java/fedora-mcc-%{major_version}_en.jar
-rm -rf /usr/share/java/fedora-mcc_en.jar
-rm -rf /usr/share/java/fedora-nmclf-%{major_version}.jar
-rm -rf /usr/share/java/fedora-nmclf.jar
-rm -rf /usr/share/java/fedora-nmclf-%{major_version}_en.jar
-rm -rf /usr/share/java/fedora-nmclf_en.jar
+%files
+%defattr(-,root,root)
+%{_javadir}/%{name}-%{version}_en.jar
+%{_javadir}/%{name}-%{major_version}_en.jar
+%{_javadir}/%{name}_en.jar
+%{_bindir}/%{name}
+
+%files framework
+%defattr(-,root,root)
+%{_javadir}/%{name}-base-%{version}.jar
+%{_javadir}/%{name}-base-%{major_version}.jar
+%{_javadir}/%{name}-base.jar
+%{_javadir}/fedora-mcc-%{version}.jar
+%{_javadir}/fedora-mcc-%{major_version}.jar
+%{_javadir}/fedora-mcc.jar
+%{_javadir}/fedora-mcc-%{version}_en.jar
+%{_javadir}/fedora-mcc-%{major_version}_en.jar
+%{_javadir}/fedora-mcc_en.jar
+%{_javadir}/fedora-nmclf-%{version}.jar
+%{_javadir}/fedora-nmclf-%{major_version}.jar
+%{_javadir}/fedora-nmclf.jar
+%{_javadir}/fedora-nmclf-%{version}_en.jar
+%{_javadir}/fedora-nmclf-%{major_version}_en.jar
+%{_javadir}/fedora-nmclf_en.jar
%changelog
+* Fri Jul 27 2007 Rich Megginson 1.1.0-4
+- fedora-ized build - clean up in prep for package review
+
* Fri Jul 27 2007 Nathan Kinder 1.1.0-3
- Changed package name to be less generic.
From fedora-directory-commits at redhat.com Mon Jul 30 23:35:51 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 30 Jul 2007 19:35:51 -0400
Subject: [Fedora-directory-commits] adminserver/m4 icu.m4,1.1,1.2
Message-ID: <200707302335.l6UNZpl2024034@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23990/m4
Modified Files:
icu.m4
Log Message:
need to set icu_libdir
Index: icu.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/m4/icu.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icu.m4 9 May 2007 00:26:38 -0000 1.1
+++ icu.m4 30 Jul 2007 23:35:49 -0000 1.2
@@ -61,6 +61,7 @@
then
AC_MSG_RESULT([using $withval])
icu_lib="-L$withval"
+ icu_libdir="$withval"
else
echo
AC_MSG_ERROR([$withval not found])
From fedora-directory-commits at redhat.com Mon Jul 30 23:35:51 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 30 Jul 2007 19:35:51 -0400
Subject: [Fedora-directory-commits] adminserver aclocal.m4, 1.19,
1.20 configure, 1.22, 1.23 missing, 1.12, 1.13 install-sh,
1.12, 1.13 depcomp, 1.12, 1.13 config.sub, 1.12,
1.13 config.guess, 1.12, 1.13 compile, 1.11, 1.12 Makefile.in,
1.25, 1.26
Message-ID: <200707302335.l6UNZp9Z024048@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23990
Modified Files:
aclocal.m4 configure missing install-sh depcomp config.sub
config.guess compile Makefile.in
Log Message:
need to set icu_libdir
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- configure 30 Jul 2007 23:13:45 -0000 1.22
+++ configure 30 Jul 2007 23:35:49 -0000 1.23
@@ -24411,6 +24411,7 @@
echo "$as_me:$LINENO: result: using $withval" >&5
echo "${ECHO_T}using $withval" >&6
icu_lib="-L$withval"
+ icu_libdir="$withval"
else
echo
{ { echo "$as_me:$LINENO: error: $withval not found" >&5
From fedora-directory-commits at redhat.com Tue Jul 31 00:07:30 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 30 Jul 2007 20:07:30 -0400
Subject: [Fedora-directory-commits] adminserver/m4 icu.m4,1.2,1.3
Message-ID: <200707310007.l6V07Uaa004679@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4623/m4
Modified Files:
icu.m4
Log Message:
need to set icu_libdir for the --with-icu case too
Index: icu.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/m4/icu.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- icu.m4 30 Jul 2007 23:35:49 -0000 1.2
+++ icu.m4 31 Jul 2007 00:07:27 -0000 1.3
@@ -27,8 +27,9 @@
if test -d "$withval"/lib
then
AC_MSG_RESULT([using $withval])
- ICUDIR=$withval
+ ICUDIR="$withval"
icu_lib="-L$ICUDIR/lib"
+ icu_libdir="$ICUDIR/lib"
else
echo
AC_MSG_ERROR([$withval not found])
From fedora-directory-commits at redhat.com Tue Jul 31 00:07:30 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 30 Jul 2007 20:07:30 -0400
Subject: [Fedora-directory-commits] adminserver aclocal.m4, 1.20,
1.21 configure, 1.23, 1.24 missing, 1.13, 1.14 install-sh,
1.13, 1.14 depcomp, 1.13, 1.14 config.sub, 1.13,
1.14 config.guess, 1.13, 1.14 compile, 1.12, 1.13 Makefile.in,
1.26, 1.27
Message-ID: <200707310007.l6V07UYH004694@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4623
Modified Files:
aclocal.m4 configure missing install-sh depcomp config.sub
config.guess compile Makefile.in
Log Message:
need to set icu_libdir for the --with-icu case too
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- configure 30 Jul 2007 23:35:49 -0000 1.23
+++ configure 31 Jul 2007 00:07:28 -0000 1.24
@@ -24357,8 +24357,9 @@
then
echo "$as_me:$LINENO: result: using $withval" >&5
echo "${ECHO_T}using $withval" >&6
- ICUDIR=$withval
+ ICUDIR="$withval"
icu_lib="-L$ICUDIR/lib"
+ icu_libdir="$ICUDIR/lib"
else
echo
{ { echo "$as_me:$LINENO: error: $withval not found" >&5
From fedora-directory-commits at redhat.com Tue Jul 31 00:19:24 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Mon, 30 Jul 2007 20:19:24 -0400
Subject: [Fedora-directory-commits] adminserver Makefile.am, 1.24,
1.25 Makefile.in, 1.27, 1.28 aclocal.m4, 1.21, 1.22 configure,
1.24, 1.25 configure.ac, 1.13, 1.14
Message-ID: <200707310019.l6V0JOG9007724@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318
Modified Files:
Makefile.am Makefile.in aclocal.m4 configure configure.ac
Log Message:
Resolves: #203999
Summary: HP-UX: mime.types is not in /etc. (comment #5)
Description: Introducing httpdconfdir to httpd.conf.in, which is going to be
replaced with the parent directory of the httpd.conf full-path if the
directory has mime.types (for HP-UX). Otherwise, check /etc if mime.types
is located in the directory (for RHELs and Solaris). If mime.types is not
found in the both directories, issue an error.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.am 27 Jul 2007 01:42:46 -0000 1.24
+++ Makefile.am 31 Jul 2007 00:19:21 -0000 1.25
@@ -419,6 +419,7 @@
-e 's, at securitydir\@,$(securitydir),g' \
-e 's, at httpduser\@,$(httpduser),g' \
-e 's, at httpdgroup\@,$(httpdgroup),g' \
+ -e 's, at httpdconfdir\@,$(httpdconfdir),g' \
-e 's, at piddir\@,$(piddir),g' \
-e 's, at pidfile\@,$(pidfile),g' \
-e 's, at admservport\@,$(admservport),g' \
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile.in 31 Jul 2007 00:07:28 -0000 1.27
+++ Makefile.in 31 Jul 2007 00:19:21 -0000 1.28
@@ -394,7 +394,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -443,6 +442,7 @@
host_vendor = @host_vendor@
htmldir = $(datadir)@htmldir@
httpdconf = @httpdconf@
+httpdconfdir = @httpdconfdir@
httpdgroup = @httpdgroup@
httpduser = @httpduser@
icondir = $(datadir)@icondir@
@@ -811,6 +811,7 @@
-e 's, at securitydir\@,$(securitydir),g' \
-e 's, at httpduser\@,$(httpduser),g' \
-e 's, at httpdgroup\@,$(httpdgroup),g' \
+ -e 's, at httpdconfdir\@,$(httpdconfdir),g' \
-e 's, at piddir\@,$(piddir),g' \
-e 's, at pidfile\@,$(pidfile),g' \
-e 's, at admservport\@,$(admservport),g' \
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/aclocal.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- aclocal.m4 31 Jul 2007 00:07:28 -0000 1.21
+++ aclocal.m4 31 Jul 2007 00:19:21 -0000 1.22
@@ -1578,27 +1578,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -4305,9 +4288,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4441,11 +4421,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4457,7 +4437,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4537,7 +4517,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6373,7 +6353,6 @@
done
done
done
-IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6406,7 +6385,6 @@
done
])
SED=$lt_cv_path_SED
-AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- configure 31 Jul 2007 00:07:28 -0000 1.24
+++ configure 31 Jul 2007 00:19:21 -0000 1.25
@@ -468,7 +468,7 @@
ac_default_prefix=/opt/fedora-ds
ac_subdirs_all="$ac_subdirs_all mod_admserv"
ac_subdirs_all="$ac_subdirs_all mod_restartd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -3832,7 +3832,6 @@
done
done
done
-IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3867,7 +3866,6 @@
fi
SED=$lt_cv_path_SED
-
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -4308,7 +4306,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4311 "configure"' > conftest.$ac_ext
+ echo '#line 4309 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5443,7 +5441,7 @@
# Provide some information about the compiler.
-echo "$as_me:5446:" \
+echo "$as_me:5444:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6506,11 +6504,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6509: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6507: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6513: \$? = $ac_status" >&5
+ echo "$as_me:6511: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6774,11 +6772,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6777: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6775: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6781: \$? = $ac_status" >&5
+ echo "$as_me:6779: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6878,11 +6876,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6881: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6879: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6885: \$? = $ac_status" >&5
+ echo "$as_me:6883: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8343,31 +8341,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 8350 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9244,7 +9221,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11664: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11694: \$? = $ac_status" >&5
+ echo "$as_me:11668: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11791,11 +11765,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11794: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11768: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11798: \$? = $ac_status" >&5
+ echo "$as_me:11772: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12323,31 +12297,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 12330 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12731,9 +12684,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -12867,11 +12817,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_CXX
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_CXX
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -12883,7 +12833,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12963,7 +12913,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13385,11 +13335,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13388: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13338: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13392: \$? = $ac_status" >&5
+ echo "$as_me:13342: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13489,11 +13439,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13492: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13442: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13496: \$? = $ac_status" >&5
+ echo "$as_me:13446: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14934,31 +14884,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 14941 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15342,9 +15271,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -15478,11 +15404,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_F77
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_F77
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -15494,7 +15420,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -15574,7 +15500,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15716,11 +15642,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15719: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15645: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15723: \$? = $ac_status" >&5
+ echo "$as_me:15649: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15984,11 +15910,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15987: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15913: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15991: \$? = $ac_status" >&5
+ echo "$as_me:15917: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16088,11 +16014,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16091: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16017: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16095: \$? = $ac_status" >&5
+ echo "$as_me:16021: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17553,31 +17479,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 17560 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17961,9 +17866,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18097,11 +17999,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_GCJ
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_GCJ
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18113,7 +18015,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18193,7 +18095,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18445,9 +18347,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18581,11 +18480,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_RC
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_RC
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18597,7 +18496,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18677,7 +18576,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -23562,6 +23461,17 @@
mimemagic=${httpd_root}/${mimemagic}
fi
+# check for mime.types file
+httpdconfdir=`dirname $httpdconf`
+if test ! -f $httpdconfdir/mime.types ; then
+ httpdconfdir="/etc"
+ if test ! -f $httpdconfdir/mime.types ; then
+ { { echo "$as_me:$LINENO: error: mime.types file not found" >&5
+echo "$as_me: error: mime.types file not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+
# check for --with-apxs
echo "$as_me:$LINENO: checking for --with-apxs" >&5
echo $ECHO_N "checking for --with-apxs... $ECHO_C" >&6
@@ -24909,6 +24819,7 @@
+
# WINNT should be true if building on Windows system not using
# cygnus, mingw, or the like and using cmd.exe as the shell
@@ -25716,7 +25627,6 @@
s, at CCDEPMODE@,$CCDEPMODE,;t t
s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s, at SED@,$SED,;t t
s, at EGREP@,$EGREP,;t t
s, at LN_S@,$LN_S,;t t
s, at ECHO@,$ECHO,;t t
@@ -25776,6 +25686,7 @@
s, at icondir@,$icondir,;t t
s, at manualdir@,$manualdir,;t t
s, at httpdconf@,$httpdconf,;t t
+s, at httpdconfdir@,$httpdconfdir,;t t
s, at mimemagic@,$mimemagic,;t t
s, at httpduser@,$httpduser,;t t
s, at httpdgroup@,$httpdgroup,;t t
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- configure.ac 30 Jul 2007 23:13:45 -0000 1.13
+++ configure.ac 31 Jul 2007 00:19:22 -0000 1.14
@@ -276,6 +276,7 @@
AC_SUBST(icondir)
AC_SUBST(manualdir)
AC_SUBST(httpdconf)
+AC_SUBST(httpdconfdir)
AC_SUBST(mimemagic)
AC_SUBST(httpduser)
AC_SUBST(httpdgroup)
From fedora-directory-commits at redhat.com Tue Jul 31 00:19:24 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Mon, 30 Jul 2007 20:19:24 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff
httpd.conf.in, 1.5, 1.6
Message-ID: <200707310019.l6V0JOrX007732@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/admserv/cfgstuff
Modified Files:
httpd.conf.in
Log Message:
Resolves: #203999
Summary: HP-UX: mime.types is not in /etc. (comment #5)
Description: Introducing httpdconfdir to httpd.conf.in, which is going to be
replaced with the parent directory of the httpd.conf full-path if the
directory has mime.types (for HP-UX). Otherwise, check /etc if mime.types
is located in the directory (for RHELs and Solaris). If mime.types is not
found in the both directories, issue an error.
Index: httpd.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- httpd.conf.in 21 May 2007 15:52:26 -0000 1.5
+++ httpd.conf.in 31 Jul 2007 00:19:22 -0000 1.6
@@ -277,7 +277,7 @@
# TypesConfig describes where the mime.types file (or equivalent) is
# to be found.
#
-TypesConfig /etc/mime.types
+TypesConfig @httpdconfdir@/mime.types
#
# DefaultType is the default MIME type the server will use for a document
From fedora-directory-commits at redhat.com Tue Jul 31 00:19:25 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Mon, 30 Jul 2007 20:19:25 -0400
Subject: [Fedora-directory-commits] adminserver/m4 httpd.m4,1.4,1.5
Message-ID: <200707310019.l6V0JPHa007739@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/m4
Modified Files:
httpd.m4
Log Message:
Resolves: #203999
Summary: HP-UX: mime.types is not in /etc. (comment #5)
Description: Introducing httpdconfdir to httpd.conf.in, which is going to be
replaced with the parent directory of the httpd.conf full-path if the
directory has mime.types (for HP-UX). Otherwise, check /etc if mime.types
is located in the directory (for RHELs and Solaris). If mime.types is not
found in the both directories, issue an error.
Index: httpd.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/m4/httpd.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httpd.m4 22 Jun 2007 01:34:20 -0000 1.4
+++ httpd.m4 31 Jul 2007 00:19:22 -0000 1.5
@@ -66,6 +66,15 @@
mimemagic=${httpd_root}/${mimemagic}
fi
+# check for mime.types file
+httpdconfdir=`dirname $httpdconf`
+if test ! -f $httpdconfdir/mime.types ; then
+ httpdconfdir="/etc"
+ if test ! -f $httpdconfdir/mime.types ; then
+ AC_MSG_ERROR([mime.types file not found])
+ fi
+fi
+
# check for --with-apxs
AC_MSG_CHECKING(for --with-apxs)
AC_ARG_WITH(apxs,