May 2007 - 389-commits - Fedora Mailing-Lists

[Fedora-directory-commits] adminserver/admserv/cfgstuff admserv.conf.in, NONE, 1.1 console.conf.in, NONE, 1.1 httpd-2.2.conf.in, NONE, 1.1 httpd.conf.in, NONE, 1.1 nss.conf.in, NONE, 1.1 restart-admin.in, NONE, 1.1 start-admin.in, NONE, 1.1 stop-admin.in, NONE, 1.1 admserv.conf, 1.16, NONE console.conf, 1.3, NONE httpd-2.2.conf, 1.1, NONE httpd.conf, 1.8, NONE nss.conf, 1.2, NONE restart-admin, 1.2, NONE start-admin, 1.7, NONE stop-admin, 1.3, NONE

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32253/adminserver/admserv/cfgstuff Added Files: admserv.conf.in console.conf.in httpd-2.2.conf.in httpd.conf.in nss.conf.in restart-admin.in start-admin.in stop-admin.in Removed Files: admserv.conf console.conf httpd-2.2.conf httpd.conf nss.conf restart-admin start-admin stop-admin Log Message: Resolves: bug 239502, bug 186280 Description: adminserver: autotools, FHS, clean up CGI parameters Fix Description: Too numerous to mention --- NEW FILE admserv.conf.in --- # BEGIN COPYRIGHT BLOCK # 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 # # To get the Admin Express working properly, add the following to # apache, either directly or thru an Include /path/to/this.conf ADMCacheLifeTime 600 ADMServerVersionString "@brand@-Administrator/@PACKAGE_VERSION@" ScriptAlias /bin/admin/admin/bin/ "@cgibindir@" ScriptAlias /dist/ "@cgibindir@" ScriptAlias /manual/help/ "@cgibindir@" # all access is explicitly denied by default in httpd.conf # the following Directory directives turn on access for specific # directories <Directory "@manualdir@/"> AllowOverride None Options None Order allow,deny Allow from all </Directory> <Directory "@icondir@"> AllowOverride None Options None Order allow,deny Allow from all </Directory> # remap / requests to the download CGI RewriteEngine on RewriteRule ^/$ /bin/admin/admin/bin/download [R,L,QSA] # remap admin server icons Alias /admin-serv/tasks/icons/ @icondir@ # Handle the initial login <Location /admin-serv/authenticate> SetHandler user-auth AuthUserFile @configdir@/admpw AuthType basic AuthName "Admin Server" Require valid-user Order allow,deny Allow from all </Location> # Handle Other Console tasks <LocationMatch /admin*/[tT]asks/[Oo]peration/*> AuthUserFile @configdir@/admpw AuthType basic AuthName "Admin Server" Require valid-user AdminSDK on ADMCgiBinDir @cgibindir@ Options +ExecCGI Order allow,deny Allow from all </LocationMatch> # Handle Other Console tasks <LocationMatch /slapd*/[tT]asks/[Oo]peration/*> AuthUserFile @configdir@/admpw AuthType basic AuthName "Admin Server" Require valid-user AdminSDK on ADMCgiBinDir @cgibindir@ Options +ExecCGI Order allow,deny Allow from all </LocationMatch> # Handle Admin Express <LocationMatch /admin*/[tT]asks/[Cc]onfiguration/*> AuthUserFile @configdir@/admpw AuthType basic AuthName "Admin Server" Require valid-user AdminSDK on ADMCgiBinDir @cgibindir@ NESCompatEnv on Options +ExecCGI Order allow,deny Allow from all </LocationMatch> # Handle Admin Express <LocationMatch /slapd*/[tT]asks/[Cc]onfiguration/*> AuthUserFile @configdir@/admpw AuthType basic AuthName "Admin Server" Require valid-user AdminSDK on ADMCgiBinDir @cgibindir@ NESCompatEnv on Options +ExecCGI Order allow,deny Allow from all </LocationMatch> # Handle internal commands <LocationMatch /admin-serv/commands/*> AuthUserFile @configdir@/admpw AuthType basic AuthName "Admin Server" Require valid-user Order allow,deny Allow from all </LocationMatch> # Handle Stop, Start, Restart, Instance Creation - invoke mod_restartd # need to add instance creation because you may want to create an instance # of DS on a low port, and instance creation starts the instance as well <LocationMatch /slapd*/[tT]asks/[Oo]peration/(?i:stop|start|restart|startconfigds|create)$> AuthUserFile @configdir@/admpw AuthType basic AuthName "Admin Server" Require valid-user ## turn off the password pipe when using mod_restartd AdminSDK off ADMCgiBinDir @cgibindir@ Options +ExecCGI RetainPerms on Order allow,deny Allow from all </LocationMatch> # Handle Stop, Start, Restart, Instance Creation - invoke mod_restartd # need to add instance creation because you may want to create an instance # of DS on a low port, and instance creation starts the instance as well <LocationMatch /admin*/[tT]asks/[Oo]peration/(?i:stop|start|restart|startconfigds|create)$> AuthUserFile @configdir@/admpw AuthType basic AuthName "Admin Server" Require valid-user ## turn off the password pipe when using mod_restartd AdminSDK off ADMCgiBinDir @cgibindir@ Options +ExecCGI RetainPerms on Order allow,deny Allow from all </LocationMatch> --- NEW FILE console.conf.in --- # BEGIN COPYRIGHT BLOCK # 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 <IfModule !mpm_winnt.c> <IfModule !mpm_netware.c> # # If you wish httpd to run as a different user or group, you must run # httpd as root initially and it will switch. # # User/Group: The name (or #number) of the user/group to run httpd as. # . On SCO (ODT 3) use "User nouser" and "Group nogroup". # . On HPUX you may not be able to use shared memory as nobody, and the # suggested workaround is to create a user www and use that user. # NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET) # when the value of (unsigned)Group is above 60000; # don't use Group #-1 on these systems! # User @httpduser@ Group @httpdgroup@ </IfModule> </IfModule> # # PidFile: The file in which the server should record its process # identification number when it starts. # <IfModule !mpm_netware.c> PidFile @piddir@/@pidfile@ </IfModule> # # The location and format of the access logfile (Common Logfile Format). # If you do not define any access logfiles within a <VirtualHost> # container, they will be logged here. Contrariwise, if you *do* # define per-<VirtualHost> access logfiles, transactions will be # logged therein and *not* in this file. # CustomLog @logdir@/access common # # ErrorLog: The location of the error log file. # If you do not specify an ErrorLog directive within a <VirtualHost> # container, error messages relating to that virtual host will be # logged here. If you *do* define an error logfile for a <VirtualHost> # container, that host's errors will be logged there and not here. # ErrorLog @logdir@/error # # Listen: Allows you to bind Apache to specific IP addresses and/or # ports, in addition to the default. See also the <VirtualHost> # directive. # # Change this to Listen on specific IP addresses as shown below to # prevent Apache from glomming onto all bound IP addresses (0.0.0.0) # e.g. "Listen 12.34.56.78:80" # # To allow connections to IPv6 addresses add "Listen [::]:80" # Listen @admservport@ # SSL Engine Switch: # Enable/Disable SSL for this virtual host. NSSEngine off # SSL Certificate Nickname: # The nickname of the server certificate you are going to use. NSSNickname server-cert # Server Certificate Database: # The NSS security database directory that holds the certificates and # keys. The database consists of 3 files: cert8.db, key3.db and secmod.db. # Provide the directory that these files exist. NSSCertificateDatabase @securitydir@ # no prefix anymore - assumes securitydir has only the sec files for admin server #NSSDBPrefix %%%instancename%%%- # SSL Cipher Suite: # List the ciphers that the client is permitted to negotiate. # See the mod_nss documentation for a complete list. NSSCipherSuite -des,-rc2export,+rc4export,+desede3,+rc4,-rc2,+rsa_rc2_40_md5,+rsa_rc4_128_md5,+rsa_3des_sha,+rsa_rc4_40_md5,+fips_des_sha,+fips_3des_sha,+rsa_des_sha,-rsa_null_md5 NSSProtocol SSLv3,TLSv1 # Client Authentication (Type): # Client certificate verification type. Types are none, optional and # require. NSSVerifyClient none --- NEW FILE httpd-2.2.conf.in --- # BEGIN COPYRIGHT BLOCK # 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 # # Based upon the NCSA server configuration files originally by Rob McCool. # # This is the main Apache server configuration file. It contains the # configuration directives that give the server its instructions. # See <URL:http://httpd.apache.org/docs-2.0/> for detailed information about # the directives. # # Do NOT simply read the instructions in here without understanding # what they do. They're here only as hints or reminders. If you are unsure # consult the online docs. You have been warned. # # The configuration directives are grouped into three basic sections: # 1. Directives that control the operation of the Apache server process as a # whole (the 'global environment'). # 2. Directives that define the parameters of the 'main' or 'default' server, # which responds to requests that aren't handled by a virtual host. # These directives also provide default values for the settings # of all virtual hosts. # 3. Settings for virtual hosts, which allow Web requests to be sent to # different IP addresses or hostnames and have them handled by the # same Apache server process. # # Configuration and logfile names: If the filenames you specify for many # of the server's control files begin with "/" (or "drive:/" for Win32), the # server will use that explicit path. If the filenames do *not* begin # with "/", the value of ServerRoot is prepended -- so "logs/foo.log" # with ServerRoot set to "/path/redhat/apache" will be interpreted by the # server as "/path/redhat/apache/logs/foo.log". # ### Section 1: Global Environment # # The directives in this section affect the overall operation of Apache, # such as the number of concurrent requests it can handle or where it # can find its configuration files. # # # ServerRoot: The top of the directory tree under which the server's # configuration, error, and log files are kept. # # NOTE! If you intend to place this on an NFS (or otherwise network) # mounted filesystem then please read the LockFile documentation (available # at <URL:http://httpd.apache.org/docs-2.0/mod/mpm_common.html#lockfile>); # you will save yourself a lot of trouble. # # Do NOT add a slash at the end of the directory path. # #ServerRoot This is passed in via the start-admin command line # # Timeout: The number of seconds before receives and sends time out. # Timeout 300 # # KeepAlive: Whether or not to allow persistent connections (more than # one request per connection). Set to "Off" to deactivate. # KeepAlive Off # # MaxKeepAliveRequests: The maximum number of requests to allow # during a persistent connection. Set to 0 to allow an unlimited amount. # We recommend you leave this number high, for maximum performance. # MaxKeepAliveRequests 100 # # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. # KeepAliveTimeout 15 # The console bombs on the x.y.z version format, so omit the .z ServerTokens Minor # start one server in multi threaded mode StartServers 1 # mtm ServerLimit 1 MaxClients 64 MinSpareThreads 32 MaxSpareThreads 64 ThreadsPerChild 64 # # Dynamic Shared Object (DSO) Support # # To be able to use the functionality of a module which was built as a DSO you # have to place corresponding `LoadModule' lines at this location so the # directives contained in it are actually available _before_ they are used. # Statically compiled modules (those listed by `httpd -l') do not need # to be loaded here. # # Example: # LoadModule foo_module modules/mod_foo.so LoadModule authz_host_module @moddir(a)/modules/mod_authz_host.so LoadModule auth_basic_module @moddir(a)/modules/mod_auth_basic.so LoadModule authn_file_module @moddir(a)/modules/mod_authn_file.so LoadModule log_config_module @moddir(a)/modules/mod_log_config.so LoadModule env_module @moddir(a)/modules/mod_env.so LoadModule mime_magic_module @moddir(a)/modules/mod_mime_magic.so LoadModule expires_module @moddir(a)/modules/mod_expires.so LoadModule deflate_module @moddir(a)/modules/mod_deflate.so LoadModule headers_module @moddir(a)/modules/mod_headers.so LoadModule unique_id_module @moddir(a)/modules/mod_unique_id.so LoadModule setenvif_module @moddir(a)/modules/mod_setenvif.so LoadModule mime_module @moddir(a)/modules/mod_mime.so LoadModule vhost_alias_module @moddir(a)/modules/mod_vhost_alias.so LoadModule negotiation_module @moddir(a)/modules/mod_negotiation.so LoadModule dir_module @moddir(a)/modules/mod_dir.so LoadModule actions_module @moddir(a)/modules/mod_actions.so LoadModule alias_module @moddir(a)/modules/mod_alias.so LoadModule rewrite_module @moddir(a)/modules/mod_rewrite.so LoadModule cache_module @moddir(a)/modules/mod_cache.so LoadModule disk_cache_module @moddir(a)/modules/mod_disk_cache.so LoadModule file_cache_module @moddir(a)/modules/mod_file_cache.so LoadModule mem_cache_module @moddir(a)/modules/mod_mem_cache.so LoadModule cgi_module @moddir(a)/modules/mod_cgi.so LoadModule restartd_module @moddir(a)/libmodrestartd.so LoadModule nss_module @moddir(a)/libmodnss.so LoadModule admserv_module @moddir(a)/libmodadmserv.so ### Section 2: 'Main' server configuration # # The directives in this section set up the values used by the 'main' # server, which responds to any requests that aren't handled by a # <VirtualHost> definition. These values also provide defaults for # any <VirtualHost> containers you may define later in the file. # # All of these directives may appear inside <VirtualHost> containers, # in which case these default settings will be overridden for the # virtual host being defined. # # # ServerAdmin: Your address, where problems with the server should be # e-mailed. This address appears on some server-generated pages, such # as error documents. e.g. admin(a)your-domain.com # #ServerAdmin you(a)example.com # # ServerName gives the name and port that the server uses to identify itself. # This can often be determined automatically, but we recommend you specify # it explicitly to prevent problems during startup. # # If this is not set to valid DNS name for your host, server-generated # redirections will not work. See also the UseCanonicalName directive. # # If your host doesn't have a registered DNS name, enter its IP address here. # You will have to access it by its address anyway, and this will make # redirections work in a sensible way. # #ServerName www.example.com:80 # # UseCanonicalName: Determines how Apache constructs self-referencing # URLs and the SERVER_NAME and SERVER_PORT variables. # When set "Off", Apache will use the Hostname and Port supplied # by the client. When set "On", Apache will use the value of the # ServerName directive. # UseCanonicalName Off # # DocumentRoot: The directory out of which you will serve your # documents. By default, all requests are taken from this directory, but # symbolic links and aliases may be used to point to other locations. # DocumentRoot @htmldir@ # # Each directory to which Apache has access can be configured with respect # to which services and features are allowed and/or disabled in that # directory (and its subdirectories). # # First, we configure the "default" to be a very restrictive set of # features. # <Directory /> Options FollowSymLinks AllowOverride None </Directory> # # Note that from this point forward you must specifically allow # particular features to be enabled - so if something's not working as # you might expect, make sure that you have specifically enabled it # below. # # # This should be changed to whatever you set DocumentRoot to. # <Directory @htmldir@> # # Possible values for the Options directive are "None", "All", # or any combination of: # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews # # Note that "MultiViews" must be named *explicitly* --- "Options All" # doesn't give it to you. # # The Options directive is both complicated and important. Please see # http://httpd.apache.org/docs-2.0/mod/core.html#options # for more information. # Options Indexes FollowSymLinks # # AllowOverride controls what directives may be placed in .htaccess files. # It can be "All", "None", or any combination of the keywords: # Options FileInfo AuthConfig Limit # AllowOverride None # # Controls who can get stuff from this server. # By default, no one may access anything # Access must be explicitly granted in admserv.conf Order deny,allow Deny from all </Directory> # # DirectoryIndex: sets the file that Apache will serve if a directory # is requested. # # The index.html.var file (a type-map) is used to deliver content- # negotiated documents. The MultiViews Option can be used for the # same purpose, but it is much slower. # DirectoryIndex index.html index.html.var # # AccessFileName: The name of the file to look for in each directory # for additional configuration directives. See also the AllowOverride # directive. # AccessFileName .htaccess # # The following lines prevent .htaccess and .htpasswd files from being # viewed by Web clients. # <Files ~ "^\.ht"> Order allow,deny Deny from all </Files> # # TypesConfig describes where the mime.types file (or equivalent) is # to be found. # TypesConfig /etc/mime.types # # DefaultType is the default MIME type the server will use for a document # if it cannot otherwise determine one, such as from filename extensions. # If your server contains mostly text or HTML documents, "text/plain" is # a good value. If most of your content is binary, such as applications # or images, you may want to use "application/octet-stream" instead to # keep browsers from trying to display binary files as though they are # text. # DefaultType text/plain # # The mod_mime_magic module allows the server to use various hints from the # contents of the file itself to determine its type. The MIMEMagicFile # directive tells the module where the hint definitions are located. # <IfModule mod_mime_magic.c> MIMEMagicFile @moddir@/conf/magic </IfModule> # # HostnameLookups: Log the names of clients or just their IP addresses # e.g., www.apache.org (on) or 204.62.129.132 (off). # The default is off because it'd be overall better for the net if people # had to knowingly turn this feature on, since enabling it means that # each client request will result in AT LEAST one lookup request to the # nameserver. # HostnameLookups Off # # EnableMMAP: Control whether memory-mapping is used to deliver # files (assuming that the underlying OS supports it). # The default is on; turn this off if you serve from NFS-mounted # filesystems. On some systems, turning it off (regardless of # filesystem) can improve performance; for details, please see # http://httpd.apache.org/docs-2.0/mod/core.html#enablemmap # #EnableMMAP off # # EnableSendfile: Control whether the sendfile kernel support is # used to deliver files (assuming that the OS supports it). # The default is on; turn this off if you serve from NFS-mounted # filesystems. Please see # http://httpd.apache.org/docs-2.0/mod/core.html#enablesendfile # #EnableSendfile off # # LogLevel: Control the number of messages logged to the error_log. # Possible values include: debug, info, notice, warn, error, crit, # alert, emerg. # LogLevel warn # # The following directives define some format nicknames for use with # a CustomLog directive (see below). # LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined LogFormat "%h %l %u %t \"%r\" %>s %b" common LogFormat "%{Referer}i -> %U" referer LogFormat "%{User-agent}i" agent # You need to enable mod_logio.c to use %I and %O #LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio # # Optionally add a line containing the server version and virtual host # name to server-generated pages (internal error documents, FTP directory # listings, mod_status and mod_info output etc., but not CGI generated # documents or custom error documents). # Set to "EMail" to also include a mailto: link to the ServerAdmin. # Set to one of: On | Off | EMail # ServerSignature On # # Aliases: Add here as many aliases as you need (with no limit). The format is # Alias fakename realname # # Note that if you include a trailing / on fakename then the server will # require it to be present in the URL. So "/icons" isn't aliased in this # example, only "/icons/". If the fakename is slash-terminated, then the # realname must also be slash terminated, and if the fakename omits the # trailing slash, the realname must also omit it. # # We include the /icons/ alias for FancyIndexed directory listings. If you # do not use FancyIndexing, you may comment this out. # # # This should be changed to the ServerRoot/manual/. The alias provides # the manual, even if you choose to move your DocumentRoot. You may comment # this out if you do not care for the documentation. # # # ScriptAlias: This controls which directories contain server scripts. # ScriptAliases are essentially the same as Aliases, except that # documents in the realname directory are treated as applications and # run by the server when requested rather than as documents sent to the client. # The same rules about trailing "/" apply to ScriptAlias directives as to # Alias. # <IfModule mod_cgid.c> # # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path> # for setting UNIX socket for communicating with cgid. # #Scriptsock logs/cgisock </IfModule> # # Redirect allows you to tell clients about documents which used to exist in # your server's namespace, but do not anymore. This allows you to tell the # clients where to look for the relocated document. # Example: # Redirect permanent /foo http://www.example.com/bar # # DefaultLanguage and AddLanguage allows you to specify the language of # a document. You can then use content negotiation to give a browser a # file in a language the user can understand. # # Specify a default language. This means that all data # going out without a specific language tag (see below) will # be marked with this one. You probably do NOT want to set # this unless you are sure it is correct for all cases. # # * It is generally better to not mark a page as # * being a certain language than marking it with the wrong # * language! # # DefaultLanguage nl # # Note 1: The suffix does not have to be the same as the language # keyword --- those with documents in Polish (whose net-standard # language code is pl) may wish to use "AddLanguage pl .po" to # avoid the ambiguity with the common suffix for perl scripts. # # Note 2: The example entries below illustrate that in some cases # the two character 'Language' abbreviation is not identical to # the two character 'Country' code for its country, # E.g. 'Danmark/dk' versus 'Danish/da'. # # Note 3: In the case of 'ltz' we violate the RFC by using a three char # specifier. There is 'work in progress' to fix this and get # the reference data for rfc1766 cleaned up. # # Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl) # English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de) # Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja) # Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn) # Norwegian (no) - Polish (pl) - Portugese (pt) # Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv) # Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW) # AddLanguage ca .ca AddLanguage cs .cz .cs AddLanguage da .dk AddLanguage de .de AddLanguage el .el AddLanguage en .en AddLanguage eo .eo AddLanguage es .es AddLanguage et .et AddLanguage fr .fr AddLanguage he .he AddLanguage hr .hr AddLanguage it .it AddLanguage ja .ja AddLanguage ko .ko AddLanguage ltz .ltz AddLanguage nl .nl AddLanguage nn .nn AddLanguage no .no AddLanguage pl .po AddLanguage pt .pt AddLanguage pt-BR .pt-br AddLanguage ru .ru AddLanguage sv .sv AddLanguage zh-CN .zh-cn AddLanguage zh-TW .zh-tw # # LanguagePriority allows you to give precedence to some languages # in case of a tie during content negotiation. # # Just list the languages in decreasing order of preference. We have # more or less alphabetized them here. You probably want to change this. # LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW # # ForceLanguagePriority allows you to serve a result page rather than # MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback) # [in case no accepted languages matched the available variants] # ForceLanguagePriority Prefer Fallback # # Commonly used filename extensions to character sets. You probably # want to avoid clashes with the language extensions, unless you # are good at carefully testing your setup after each change. # See http://www.iana.org/assignments/character-sets for the # official list of charset names and their respective RFCs. # AddCharset ISO-8859-1 .iso8859-1 .latin1 AddCharset ISO-8859-2 .iso8859-2 .latin2 .cen AddCharset ISO-8859-3 .iso8859-3 .latin3 AddCharset ISO-8859-4 .iso8859-4 .latin4 AddCharset ISO-8859-5 .iso8859-5 .latin5 .cyr .iso-ru AddCharset ISO-8859-6 .iso8859-6 .latin6 .arb AddCharset ISO-8859-7 .iso8859-7 .latin7 .grk AddCharset ISO-8859-8 .iso8859-8 .latin8 .heb AddCharset ISO-8859-9 .iso8859-9 .latin9 .trk AddCharset ISO-2022-JP .iso2022-jp .jis AddCharset ISO-2022-KR .iso2022-kr .kis AddCharset ISO-2022-CN .iso2022-cn .cis AddCharset Big5 .Big5 .big5 # For russian, more than one charset is used (depends on client, mostly): AddCharset WINDOWS-1251 .cp-1251 .win-1251 AddCharset CP866 .cp866 AddCharset KOI8-r .koi8-r .koi8-ru AddCharset KOI8-ru .koi8-uk .ua AddCharset ISO-10646-UCS-2 .ucs2 AddCharset ISO-10646-UCS-4 .ucs4 AddCharset UTF-8 .utf8 # The set below does not map to a specific (iso) standard # but works on a fairly wide range of browsers. Note that # capitalization actually matters (it should not, but it # does for some browsers). # # See http://www.iana.org/assignments/character-sets # for a list of sorts. But browsers support few. # AddCharset GB2312 .gb2312 .gb AddCharset utf-7 .utf7 AddCharset utf-8 .utf8 AddCharset big5 .big5 .b5 AddCharset EUC-TW .euc-tw AddCharset EUC-JP .euc-jp AddCharset EUC-KR .euc-kr AddCharset shift_jis .sjis # # AddType allows you to add to or override the MIME configuration # file mime.types for specific file types. # #AddType application/x-tar .tgz # # AddEncoding allows you to have certain browsers uncompress # information on the fly. Note: Not all browsers support this. # Despite the name similarity, the following Add* directives have nothing # to do with the FancyIndexing customization directives above. # #AddEncoding x-compress .Z #AddEncoding x-gzip .gz .tgz # # If the AddEncoding directives above are commented-out, then you # probably should define those extensions to indicate media types: # AddType application/x-compress .Z AddType application/x-gzip .gz .tgz # # AddHandler allows you to map certain file extensions to "handlers": # actions unrelated to filetype. These can be either built into the server # or added with the Action directive (see below) # # To use CGI scripts outside of ScriptAliased directories: # (You will also need to add "ExecCGI" to the "Options" directive.) # #AddHandler cgi-script .cgi # # For files that include their own HTTP headers: # #AddHandler send-as-is asis # # For server-parsed imagemap files: # #AddHandler imap-file map # # For type maps (negotiated resources): # (This is enabled by default to allow the Apache "It Worked" page # to be distributed in multiple languages.) # AddHandler type-map var # # Filters allow you to process content before it is sent to the client. # # To parse .shtml files for server-side includes (SSI): # (You will also need to add "Includes" to the "Options" directive.) # #AddType text/html .shtml #AddOutputFilter INCLUDES .shtml # # Action lets you define media types that will execute a script whenever # a matching file is called. This eliminates the need for repeated URL # pathnames for oft-used CGI file processors. # Format: Action media/type /cgi-script/location # Format: Action handler-name /cgi-script/location # # # Customizable error responses come in three flavors: # 1) plain text 2) local redirects 3) external redirects # # Some examples: #ErrorDocument 500 "The server made a boo boo." #ErrorDocument 404 /missing.html #ErrorDocument 404 "/cgi-bin/missing_handler.pl" #ErrorDocument 402 http://www.example.com/subscription_info.html # # # Putting this all together, we can internationalize error responses. # # We use Alias to redirect any /error/HTTP_<error>.html.var response to # our collection of by-error message multi-language collections. We use # includes to substitute the appropriate text. # # You can modify the messages' appearance without changing any of the # default HTTP_<error>.html.var files by adding the line: # # Alias /error/include/ "/your/include/path/" # # which allows you to create your own set of files by starting with the # /path/to/error/include/ files and copying them to /your/include/path/, # even on a per-VirtualHost basis. The default include files will display # your Apache version number and your ServerAdmin email address regardless # of the setting of ServerSignature. # # The internationalized error documents require mod_alias, mod_include # and mod_negotiation. To activate them, uncomment the following 30 lines. # Alias /error/ "/path/redhat/apache/error/" # # <Directory "/path/redhat/apache/error"> # AllowOverride None # Options IncludesNoExec # AddOutputFilter Includes html # AddHandler type-map var # Order allow,deny # Allow from all # LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr # ForceLanguagePriority Prefer Fallback # </Directory> # # ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var # ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var # ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var # ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var # ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var # ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var # ErrorDocument 410 /error/HTTP_GONE.html.var # ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var # ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var # ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var # ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var # ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var # ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var # ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var # ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var # ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var # ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var # # The following directives modify normal HTTP response behavior to # handle known problems with browser implementations. # BrowserMatch "Mozilla/2" nokeepalive BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 BrowserMatch "RealPlayer 4\.0" force-response-1.0 BrowserMatch "Java/1\.0" force-response-1.0 BrowserMatch "JDK/1\.0" force-response-1.0 # # The following directive disables redirects on non-GET requests for # a directory that does not include the trailing slash. This fixes a # problem with Microsoft WebFolders which does not appropriately handle # redirects for folders with DAV methods. # Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. # BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully BrowserMatch "^WebDrive" redirect-carefully BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully BrowserMatch "^gnome-vfs" redirect-carefully # # Allow server status reports generated by mod_status, # with the URL of http://servername/server-status # Change the ".example.com" to match your domain to enable. # #<Location /server-status> # SetHandler server-status # Order deny,allow # Deny from all # Allow from .example.com #</Location> # # Allow remote server configuration reports, with the URL of # http://servername/server-info (requires that mod_info.c be loaded). # Change the ".example.com" to match your domain to enable. # #<Location /server-info> # SetHandler server-info # Order deny,allow # Deny from all # Allow from .example.com #</Location> ### Section 3: Virtual Hosts # # VirtualHost: If you want to maintain multiple domains/hostnames on your # machine you can setup VirtualHost containers for them. Most configurations # use only name-based virtual hosts so the server doesn't need to worry about # IP addresses. This is indicated by the asterisks in the directives below. # # Please see the documentation at # <URL:http://httpd.apache.org/docs-2.0/vhosts/> # for further details before you try to setup virtual hosts. # # You may use the command line option '-S' to verify your virtual host # configuration. # # Use name-based virtual hosting. # #NameVirtualHost *:80 # # VirtualHost example: # Almost any Apache directive may go into a VirtualHost container. # The first VirtualHost section is used for requests without a known # server name. # #<VirtualHost *:80> # ServerAdmin webmaster(a)dummy-host.example.com # DocumentRoot /www/docs/dummy-host.example.com # ServerName dummy-host.example.com # ErrorLog logs/dummy-host.example.com-error_log # CustomLog logs/dummy-host.example.com-access_log common #</VirtualHost> Include @configdir(a)/admserv.conf Include @configdir(a)/nss.conf Include @configdir(a)/console.conf --- NEW FILE httpd.conf.in --- # BEGIN COPYRIGHT BLOCK # 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 # # Based upon the NCSA server configuration files originally by Rob McCool. # # This is the main Apache server configuration file. It contains the # configuration directives that give the server its instructions. # See <URL:http://httpd.apache.org/docs-2.0/> for detailed information about # the directives. # # Do NOT simply read the instructions in here without understanding # what they do. They're here only as hints or reminders. If you are unsure # consult the online docs. You have been warned. # # The configuration directives are grouped into three basic sections: # 1. Directives that control the operation of the Apache server process as a # whole (the 'global environment'). # 2. Directives that define the parameters of the 'main' or 'default' server, # which responds to requests that aren't handled by a virtual host. # These directives also provide default values for the settings # of all virtual hosts. # 3. Settings for virtual hosts, which allow Web requests to be sent to # different IP addresses or hostnames and have them handled by the # same Apache server process. # # Configuration and logfile names: If the filenames you specify for many # of the server's control files begin with "/" (or "drive:/" for Win32), the # server will use that explicit path. If the filenames do *not* begin # with "/", the value of ServerRoot is prepended -- so "logs/foo.log" # with ServerRoot set to "/path/redhat/apache" will be interpreted by the # server as "/path/redhat/apache/logs/foo.log". # ### Section 1: Global Environment # # The directives in this section affect the overall operation of Apache, # such as the number of concurrent requests it can handle or where it # can find its configuration files. # # # ServerRoot: The top of the directory tree under which the server's # configuration, error, and log files are kept. # # NOTE! If you intend to place this on an NFS (or otherwise network) # mounted filesystem then please read the LockFile documentation (available # at <URL:http://httpd.apache.org/docs-2.0/mod/mpm_common.html#lockfile>); # you will save yourself a lot of trouble. # # Do NOT add a slash at the end of the directory path. # #ServerRoot This is passed in via the start-admin command line # # Timeout: The number of seconds before receives and sends time out. # Timeout 300 # # KeepAlive: Whether or not to allow persistent connections (more than # one request per connection). Set to "Off" to deactivate. # KeepAlive Off # # MaxKeepAliveRequests: The maximum number of requests to allow # during a persistent connection. Set to 0 to allow an unlimited amount. # We recommend you leave this number high, for maximum performance. # MaxKeepAliveRequests 100 # # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. # KeepAliveTimeout 15 # The console bombs on the x.y.z version format, so omit the .z ServerTokens Minor # start one server in multi threaded mode StartServers 1 # mtm ServerLimit 1 MaxClients 64 MinSpareThreads 32 MaxSpareThreads 64 ThreadsPerChild 64 # # Dynamic Shared Object (DSO) Support # # To be able to use the functionality of a module which was built as a DSO you # have to place corresponding `LoadModule' lines at this location so the # directives contained in it are actually available _before_ they are used. # Statically compiled modules (those listed by `httpd -l') do not need # to be loaded here. # # Example: # LoadModule foo_module modules/mod_foo.so LoadModule access_module @moddir(a)/modules/mod_access.so LoadModule auth_module @moddir(a)/modules/mod_auth.so LoadModule log_config_module @moddir(a)/modules/mod_log_config.so LoadModule env_module @moddir(a)/modules/mod_env.so LoadModule mime_magic_module @moddir(a)/modules/mod_mime_magic.so LoadModule expires_module @moddir(a)/modules/mod_expires.so LoadModule deflate_module @moddir(a)/modules/mod_deflate.so LoadModule headers_module @moddir(a)/modules/mod_headers.so LoadModule unique_id_module @moddir(a)/modules/mod_unique_id.so LoadModule setenvif_module @moddir(a)/modules/mod_setenvif.so LoadModule mime_module @moddir(a)/modules/mod_mime.so LoadModule vhost_alias_module @moddir(a)/modules/mod_vhost_alias.so LoadModule negotiation_module @moddir(a)/modules/mod_negotiation.so LoadModule dir_module @moddir(a)/modules/mod_dir.so LoadModule actions_module @moddir(a)/modules/mod_actions.so LoadModule alias_module @moddir(a)/modules/mod_alias.so LoadModule rewrite_module @moddir(a)/modules/mod_rewrite.so LoadModule cache_module @moddir(a)/modules/mod_cache.so LoadModule disk_cache_module @moddir(a)/modules/mod_disk_cache.so LoadModule file_cache_module @moddir(a)/modules/mod_file_cache.so LoadModule mem_cache_module @moddir(a)/modules/mod_mem_cache.so LoadModule cgi_module @moddir(a)/modules/mod_cgi.so LoadModule restartd_module @moddir(a)/libmodrestartd.so LoadModule nss_module @moddir(a)/libmodnss.so LoadModule admserv_module @moddir(a)/libmodadmserv.so ### Section 2: 'Main' server configuration # # The directives in this section set up the values used by the 'main' # server, which responds to any requests that aren't handled by a # <VirtualHost> definition. These values also provide defaults for # any <VirtualHost> containers you may define later in the file. # # All of these directives may appear inside <VirtualHost> containers, # in which case these default settings will be overridden for the # virtual host being defined. # # # ServerAdmin: Your address, where problems with the server should be # e-mailed. This address appears on some server-generated pages, such # as error documents. e.g. admin(a)your-domain.com # #ServerAdmin you(a)example.com # # ServerName gives the name and port that the server uses to identify itself. # This can often be determined automatically, but we recommend you specify # it explicitly to prevent problems during startup. # # If this is not set to valid DNS name for your host, server-generated # redirections will not work. See also the UseCanonicalName directive. # # If your host doesn't have a registered DNS name, enter its IP address here. # You will have to access it by its address anyway, and this will make # redirections work in a sensible way. # #ServerName www.example.com:80 # # UseCanonicalName: Determines how Apache constructs self-referencing # URLs and the SERVER_NAME and SERVER_PORT variables. # When set "Off", Apache will use the Hostname and Port supplied # by the client. When set "On", Apache will use the value of the # ServerName directive. # UseCanonicalName Off # # DocumentRoot: The directory out of which you will serve your # documents. By default, all requests are taken from this directory, but # symbolic links and aliases may be used to point to other locations. # DocumentRoot @htmldir@ # # Each directory to which Apache has access can be configured with respect # to which services and features are allowed and/or disabled in that # directory (and its subdirectories). # # First, we configure the "default" to be a very restrictive set of # features. # <Directory /> Options FollowSymLinks AllowOverride None </Directory> # # Note that from this point forward you must specifically allow # particular features to be enabled - so if something's not working as # you might expect, make sure that you have specifically enabled it # below. # # # This should be changed to whatever you set DocumentRoot to. # <Directory @htmldir@> # # Possible values for the Options directive are "None", "All", # or any combination of: # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews # # Note that "MultiViews" must be named *explicitly* --- "Options All" # doesn't give it to you. # # The Options directive is both complicated and important. Please see # http://httpd.apache.org/docs-2.0/mod/core.html#options # for more information. # Options Indexes FollowSymLinks # # AllowOverride controls what directives may be placed in .htaccess files. # It can be "All", "None", or any combination of the keywords: # Options FileInfo AuthConfig Limit # AllowOverride None # # Controls who can get stuff from this server. # By default, no one may access anything # Access must be explicitly granted in admserv.conf Order deny,allow Deny from all </Directory> # # DirectoryIndex: sets the file that Apache will serve if a directory # is requested. # # The index.html.var file (a type-map) is used to deliver content- # negotiated documents. The MultiViews Option can be used for the # same purpose, but it is much slower. # DirectoryIndex index.html index.html.var # # AccessFileName: The name of the file to look for in each directory # for additional configuration directives. See also the AllowOverride # directive. # AccessFileName .htaccess # # The following lines prevent .htaccess and .htpasswd files from being # viewed by Web clients. # <Files ~ "^\.ht"> Order allow,deny Deny from all </Files> # # TypesConfig describes where the mime.types file (or equivalent) is # to be found. # TypesConfig /etc/mime.types # # DefaultType is the default MIME type the server will use for a document # if it cannot otherwise determine one, such as from filename extensions. # If your server contains mostly text or HTML documents, "text/plain" is # a good value. If most of your content is binary, such as applications # or images, you may want to use "application/octet-stream" instead to # keep browsers from trying to display binary files as though they are # text. # DefaultType text/plain # # The mod_mime_magic module allows the server to use various hints from the # contents of the file itself to determine its type. The MIMEMagicFile # directive tells the module where the hint definitions are located. # <IfModule mod_mime_magic.c> MIMEMagicFile @moddir@/conf/magic </IfModule> # # HostnameLookups: Log the names of clients or just their IP addresses # e.g., www.apache.org (on) or 204.62.129.132 (off). # The default is off because it'd be overall better for the net if people # had to knowingly turn this feature on, since enabling it means that # each client request will result in AT LEAST one lookup request to the # nameserver. # HostnameLookups Off # # EnableMMAP: Control whether memory-mapping is used to deliver # files (assuming that the underlying OS supports it). # The default is on; turn this off if you serve from NFS-mounted # filesystems. On some systems, turning it off (regardless of # filesystem) can improve performance; for details, please see # http://httpd.apache.org/docs-2.0/mod/core.html#enablemmap # #EnableMMAP off # # EnableSendfile: Control whether the sendfile kernel support is # used to deliver files (assuming that the OS supports it). # The default is on; turn this off if you serve from NFS-mounted # filesystems. Please see # http://httpd.apache.org/docs-2.0/mod/core.html#enablesendfile # #EnableSendfile off # # LogLevel: Control the number of messages logged to the error_log. # Possible values include: debug, info, notice, warn, error, crit, # alert, emerg. # LogLevel warn # # The following directives define some format nicknames for use with # a CustomLog directive (see below). # LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined LogFormat "%h %l %u %t \"%r\" %>s %b" common LogFormat "%{Referer}i -> %U" referer LogFormat "%{User-agent}i" agent # You need to enable mod_logio.c to use %I and %O #LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio # # Optionally add a line containing the server version and virtual host # name to server-generated pages (internal error documents, FTP directory # listings, mod_status and mod_info output etc., but not CGI generated # documents or custom error documents). # Set to "EMail" to also include a mailto: link to the ServerAdmin. # Set to one of: On | Off | EMail # ServerSignature On # # Aliases: Add here as many aliases as you need (with no limit). The format is # Alias fakename realname # # Note that if you include a trailing / on fakename then the server will # require it to be present in the URL. So "/icons" isn't aliased in this # example, only "/icons/". If the fakename is slash-terminated, then the # realname must also be slash terminated, and if the fakename omits the # trailing slash, the realname must also omit it. # # We include the /icons/ alias for FancyIndexed directory listings. If you # do not use FancyIndexing, you may comment this out. # # # This should be changed to the ServerRoot/manual/. The alias provides # the manual, even if you choose to move your DocumentRoot. You may comment # this out if you do not care for the documentation. # # # ScriptAlias: This controls which directories contain server scripts. # ScriptAliases are essentially the same as Aliases, except that # documents in the realname directory are treated as applications and # run by the server when requested rather than as documents sent to the client. # The same rules about trailing "/" apply to ScriptAlias directives as to # Alias. # <IfModule mod_cgid.c> # # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path> # for setting UNIX socket for communicating with cgid. # #Scriptsock logs/cgisock </IfModule> # # Redirect allows you to tell clients about documents which used to exist in # your server's namespace, but do not anymore. This allows you to tell the # clients where to look for the relocated document. # Example: # Redirect permanent /foo http://www.example.com/bar # # DefaultLanguage and AddLanguage allows you to specify the language of # a document. You can then use content negotiation to give a browser a # file in a language the user can understand. # # Specify a default language. This means that all data # going out without a specific language tag (see below) will # be marked with this one. You probably do NOT want to set # this unless you are sure it is correct for all cases. # # * It is generally better to not mark a page as # * being a certain language than marking it with the wrong # * language! # # DefaultLanguage nl # # Note 1: The suffix does not have to be the same as the language # keyword --- those with documents in Polish (whose net-standard # language code is pl) may wish to use "AddLanguage pl .po" to # avoid the ambiguity with the common suffix for perl scripts. # # Note 2: The example entries below illustrate that in some cases # the two character 'Language' abbreviation is not identical to # the two character 'Country' code for its country, # E.g. 'Danmark/dk' versus 'Danish/da'. # # Note 3: In the case of 'ltz' we violate the RFC by using a three char # specifier. There is 'work in progress' to fix this and get # the reference data for rfc1766 cleaned up. # # Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl) # English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de) # Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja) # Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn) # Norwegian (no) - Polish (pl) - Portugese (pt) # Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv) # Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW) # AddLanguage ca .ca AddLanguage cs .cz .cs AddLanguage da .dk AddLanguage de .de AddLanguage el .el AddLanguage en .en AddLanguage eo .eo AddLanguage es .es AddLanguage et .et AddLanguage fr .fr AddLanguage he .he AddLanguage hr .hr AddLanguage it .it AddLanguage ja .ja AddLanguage ko .ko AddLanguage ltz .ltz AddLanguage nl .nl AddLanguage nn .nn AddLanguage no .no AddLanguage pl .po AddLanguage pt .pt AddLanguage pt-BR .pt-br AddLanguage ru .ru AddLanguage sv .sv AddLanguage zh-CN .zh-cn AddLanguage zh-TW .zh-tw # # LanguagePriority allows you to give precedence to some languages # in case of a tie during content negotiation. # # Just list the languages in decreasing order of preference. We have # more or less alphabetized them here. You probably want to change this. # LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW # # ForceLanguagePriority allows you to serve a result page rather than # MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback) # [in case no accepted languages matched the available variants] # ForceLanguagePriority Prefer Fallback # # Commonly used filename extensions to character sets. You probably # want to avoid clashes with the language extensions, unless you # are good at carefully testing your setup after each change. # See http://www.iana.org/assignments/character-sets for the # official list of charset names and their respective RFCs. # AddCharset ISO-8859-1 .iso8859-1 .latin1 AddCharset ISO-8859-2 .iso8859-2 .latin2 .cen AddCharset ISO-8859-3 .iso8859-3 .latin3 AddCharset ISO-8859-4 .iso8859-4 .latin4 AddCharset ISO-8859-5 .iso8859-5 .latin5 .cyr .iso-ru AddCharset ISO-8859-6 .iso8859-6 .latin6 .arb AddCharset ISO-8859-7 .iso8859-7 .latin7 .grk AddCharset ISO-8859-8 .iso8859-8 .latin8 .heb AddCharset ISO-8859-9 .iso8859-9 .latin9 .trk AddCharset ISO-2022-JP .iso2022-jp .jis AddCharset ISO-2022-KR .iso2022-kr .kis AddCharset ISO-2022-CN .iso2022-cn .cis AddCharset Big5 .Big5 .big5 # For russian, more than one charset is used (depends on client, mostly): AddCharset WINDOWS-1251 .cp-1251 .win-1251 AddCharset CP866 .cp866 AddCharset KOI8-r .koi8-r .koi8-ru AddCharset KOI8-ru .koi8-uk .ua AddCharset ISO-10646-UCS-2 .ucs2 AddCharset ISO-10646-UCS-4 .ucs4 AddCharset UTF-8 .utf8 # The set below does not map to a specific (iso) standard # but works on a fairly wide range of browsers. Note that # capitalization actually matters (it should not, but it # does for some browsers). # # See http://www.iana.org/assignments/character-sets # for a list of sorts. But browsers support few. # AddCharset GB2312 .gb2312 .gb AddCharset utf-7 .utf7 AddCharset utf-8 .utf8 AddCharset big5 .big5 .b5 AddCharset EUC-TW .euc-tw AddCharset EUC-JP .euc-jp AddCharset EUC-KR .euc-kr AddCharset shift_jis .sjis # # AddType allows you to add to or override the MIME configuration # file mime.types for specific file types. # #AddType application/x-tar .tgz # # AddEncoding allows you to have certain browsers uncompress # information on the fly. Note: Not all browsers support this. # Despite the name similarity, the following Add* directives have nothing # to do with the FancyIndexing customization directives above. # #AddEncoding x-compress .Z #AddEncoding x-gzip .gz .tgz # # If the AddEncoding directives above are commented-out, then you # probably should define those extensions to indicate media types: # AddType application/x-compress .Z AddType application/x-gzip .gz .tgz # # AddHandler allows you to map certain file extensions to "handlers": # actions unrelated to filetype. These can be either built into the server # or added with the Action directive (see below) # # To use CGI scripts outside of ScriptAliased directories: # (You will also need to add "ExecCGI" to the "Options" directive.) # #AddHandler cgi-script .cgi # # For files that include their own HTTP headers: # #AddHandler send-as-is asis # # For server-parsed imagemap files: # #AddHandler imap-file map # # For type maps (negotiated resources): # (This is enabled by default to allow the Apache "It Worked" page # to be distributed in multiple languages.) # AddHandler type-map var # # Filters allow you to process content before it is sent to the client. # # To parse .shtml files for server-side includes (SSI): # (You will also need to add "Includes" to the "Options" directive.) # #AddType text/html .shtml #AddOutputFilter INCLUDES .shtml # # Action lets you define media types that will execute a script whenever # a matching file is called. This eliminates the need for repeated URL # pathnames for oft-used CGI file processors. # Format: Action media/type /cgi-script/location # Format: Action handler-name /cgi-script/location # # # Customizable error responses come in three flavors: # 1) plain text 2) local redirects 3) external redirects # # Some examples: #ErrorDocument 500 "The server made a boo boo." #ErrorDocument 404 /missing.html #ErrorDocument 404 "/cgi-bin/missing_handler.pl" #ErrorDocument 402 http://www.example.com/subscription_info.html # # # Putting this all together, we can internationalize error responses. # # We use Alias to redirect any /error/HTTP_<error>.html.var response to # our collection of by-error message multi-language collections. We use # includes to substitute the appropriate text. # # You can modify the messages' appearance without changing any of the # default HTTP_<error>.html.var files by adding the line: # # Alias /error/include/ "/your/include/path/" # # which allows you to create your own set of files by starting with the # /path/to/error/include/ files and copying them to /your/include/path/, # even on a per-VirtualHost basis. The default include files will display # your Apache version number and your ServerAdmin email address regardless # of the setting of ServerSignature. # # The internationalized error documents require mod_alias, mod_include # and mod_negotiation. To activate them, uncomment the following 30 lines. # Alias /error/ "/path/redhat/apache/error/" # # <Directory "/path/redhat/apache/error"> # AllowOverride None # Options IncludesNoExec # AddOutputFilter Includes html # AddHandler type-map var # Order allow,deny # Allow from all # LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr # ForceLanguagePriority Prefer Fallback # </Directory> # # ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var # ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var # ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var # ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var # ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var # ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var # ErrorDocument 410 /error/HTTP_GONE.html.var # ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var # ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var # ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var # ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var # ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var # ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var # ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var # ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var # ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var # ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var # # The following directives modify normal HTTP response behavior to # handle known problems with browser implementations. # BrowserMatch "Mozilla/2" nokeepalive BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 BrowserMatch "RealPlayer 4\.0" force-response-1.0 BrowserMatch "Java/1\.0" force-response-1.0 BrowserMatch "JDK/1\.0" force-response-1.0 # # The following directive disables redirects on non-GET requests for # a directory that does not include the trailing slash. This fixes a # problem with Microsoft WebFolders which does not appropriately handle # redirects for folders with DAV methods. # Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. # BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully BrowserMatch "^WebDrive" redirect-carefully BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully BrowserMatch "^gnome-vfs" redirect-carefully # # Allow server status reports generated by mod_status, # with the URL of http://servername/server-status # Change the ".example.com" to match your domain to enable. # #<Location /server-status> # SetHandler server-status # Order deny,allow # Deny from all # Allow from .example.com #</Location> # # Allow remote server configuration reports, with the URL of # http://servername/server-info (requires that mod_info.c be loaded). # Change the ".example.com" to match your domain to enable. # #<Location /server-info> # SetHandler server-info # Order deny,allow # Deny from all # Allow from .example.com #</Location> ### Section 3: Virtual Hosts # # VirtualHost: If you want to maintain multiple domains/hostnames on your # machine you can setup VirtualHost containers for them. Most configurations # use only name-based virtual hosts so the server doesn't need to worry about # IP addresses. This is indicated by the asterisks in the directives below. # # Please see the documentation at # <URL:http://httpd.apache.org/docs-2.0/vhosts/> # for further details before you try to setup virtual hosts. # # You may use the command line option '-S' to verify your virtual host # configuration. # # Use name-based virtual hosting. # #NameVirtualHost *:80 # # VirtualHost example: # Almost any Apache directive may go into a VirtualHost container. # The first VirtualHost section is used for requests without a known # server name. # #<VirtualHost *:80> # ServerAdmin webmaster(a)dummy-host.example.com # DocumentRoot /www/docs/dummy-host.example.com # ServerName dummy-host.example.com # ErrorLog logs/dummy-host.example.com-error_log # CustomLog logs/dummy-host.example.com-access_log common #</VirtualHost> Include @configdir(a)/admserv.conf Include @configdir(a)/nss.conf Include @configdir(a)/console.conf --- NEW FILE nss.conf.in --- # BEGIN COPYRIGHT BLOCK # 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 # # This is the Apache server configuration file providing SSL support using. # the mod_nss plugin. It contains the configuration directives to instruct # the server how to serve pages over an https connection. # # Do NOT simply read the instructions in here without understanding # what they do. They're here only as hints or reminders. If you are unsure # consult the online docs. You have been warned. # ## ## SSL Global Context ## ## All SSL configuration in this context applies both to ## the main server and all SSL-enabled virtual hosts. ## # # Some MIME-types for downloading Certificates and CRLs # AddType application/x-x509-ca-cert .crt AddType application/x-pkcs7-crl .crl # Pass Phrase Dialog: # Configure the pass phrase gathering process. # The filtering dialog program (`builtin' is a internal # terminal dialog) has to provide the pass phrase on stdout. NSSPassPhraseDialog builtin # Pass Phrase Helper: # This helper program stores the token password pins between # restarts of Apache. NSSPassPhraseHelper @modnssbindir@/nss_pcache # Configure the SSL Session Cache. # NSSSessionCacheSize is the number of entries in the cache. # NSSSessionCacheTimeout is the SSL2 session timeout (in seconds). # NSSSession3CacheTimeout is the SSL3/TLS session timeout (in seconds). NSSSessionCacheSize 10000 NSSSessionCacheTimeout 100 NSSSession3CacheTimeout 86400 ## ## SSL Virtual Host Context ## # Access Control: # With SSLRequire you can do per-directory access control based # on arbitrary complex boolean expressions containing server # variable checks and other lookup directives. The syntax is a # mixture between C and Perl. See the mod_nss documentation # for more details. #<Location /> #NSSRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \ # and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \ # and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \ # and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \ # and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \ # or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/ #</Location> # SSL Engine Options: # Set various options for the SSL engine. # o FakeBasicAuth: # Translate the client X.509 into a Basic Authorisation. This means that # the standard Auth/DBMAuth methods can be used for access control. The # user name is the `one line' version of the client's X.509 certificate. # Note that no password is obtained from the user. Every entry in the user # file needs this password: `xxj31ZMTZzkVA'. # o ExportCertData: # This exports two additional environment variables: SSL_CLIENT_CERT and # SSL_SERVER_CERT. These contain the PEM-encoded certificates of the # server (always existing) and the client (only existing when client # authentication is used). This can be used to import the certificates # into CGI scripts. # o StdEnvVars: # This exports the standard SSL/TLS related `SSL_*' environment variables. # Per default this exportation is switched off for performance reasons, # because the extraction step is an expensive operation and is usually # useless for serving static content. So one usually enables the # exportation for CGI and SSI requests only. # o StrictRequire: # This denies access when "NSSRequireSSL" or "NSSRequire" applied even # under a "Satisfy any" situation, i.e. when it applies access is denied # and no other module can change it. # o OptRenegotiate: # This enables optimized SSL connection renegotiation handling when SSL # directives are used in per-directory context. #NSSOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire --- NEW FILE restart-admin.in --- #!/bin/sh # 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 @cmdbindir@/stop-admin sleep 3 @cmdbindir@/start-admin --- NEW FILE start-admin.in --- #!/bin/sh # 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 # This script sets up the environment for the httpd server and starts it. # for httpd, on RHEL, this will typically be something like /usr/sbin/httpd.worker # On HP-UX, this may be /opt/hpws/apache/bin/httpd. unset PASSWORD_PIPE LD_LIBRARY_PATH=@LIBPATH@:${LD_LIBRARY_PATH};export LD_LIBRARY_PATH LIBPATH=@LIBPATH@:${LIBPATH}:/usr/threads/lib:/usr/ibmcxx/lib:/usr/lib:/lib; export LIBPATH SHLIB_PATH=@LIBPATH@:${SHLIB_PATH}; export SHLIB_PATH HTTPD=@HTTPD@ # see if httpd is linked with the openldap libraries - we need to override them OS=`uname -s` if [ $OS = "Linux" ]; then hasol=0 /usr/bin/ldd $HTTPD 2>&1 | grep libldap > /dev/null 2>&1 && hasol=1 if [ $hasol -eq 1 ] ; then LD_PRELOAD="@nss_libdir(a)/libssl3.so @ldapsdk_libdir(a)/libldap60.so" export LD_PRELOAD fi fi $HTTPD -k start -f @configdir(a)/httpd.conf "$@" --- NEW FILE stop-admin.in --- #!/bin/sh # 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 PID_FILE=@piddir@/@pidfile@ if test -f $PID_FILE ; then kill -TERM -`cat $PID_FILE` if test $? -ne 0 ; then exit 1 fi else echo server not running exit 1 fi loop_counter=1 max_count=30 while test $loop_counter -le $max_count; do loop_counter=`expr $loop_counter + 1` if test -f $PID_FILE ; then sleep 2 else exit 0 fi done echo server not responding to exit command echo killing process group kill -9 -`cat $PID_FILE` rm $PID_FILE exit 1 --- admserv.conf DELETED --- --- console.conf DELETED --- --- httpd-2.2.conf DELETED --- --- httpd.conf DELETED --- --- nss.conf DELETED --- --- restart-admin DELETED --- --- start-admin DELETED --- --- stop-admin DELETED ---

15 years, 10 months

1
0
0 / 0

[Fedora-directory-commits] adminutil adminutil.spec,1.1,1.2

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20847 Modified Files: adminutil.spec Log Message: bump version to 1.1.1 Index: adminutil.spec =================================================================== RCS file: /cvs/dirsec/adminutil/adminutil.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- adminutil.spec 4 Apr 2007 19:37:35 -0000 1.1 +++ adminutil.spec 8 May 2007 19:54:47 -0000 1.2 @@ -6,7 +6,7 @@ Summary: Utility library for directory server administration Name: adminutil -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist} License: LGPL URL: http://directory.fedoraproject.org/wiki/AdminUtil @@ -86,5 +86,8 @@ %{_includedir}/libadmsslutil %changelog +* Tue May 8 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.1-1 +- Many bug fixes - bumped version to 1.1.1 + * Wed Mar 28 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-1 - Initial version - based largely on svrcore.spec

15 years, 10 months

1
0
0 / 0

[Fedora-directory-commits] adminutil Makefile.in, 1.2, 1.3 aclocal.m4, 1.2, 1.3 configure, 1.2, 1.3 configure.ac, 1.2, 1.3 ltmain.sh, 1.2, 1.3

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20266 Modified Files: Makefile.in aclocal.m4 configure configure.ac ltmain.sh Log Message: bump version to 1.1.1 Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/adminutil/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 4 Apr 2007 19:37:35 -0000 1.2 +++ Makefile.in 8 May 2007 19:25:45 -0000 1.3 @@ -208,7 +208,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/adminutil/aclocal.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- aclocal.m4 4 Apr 2007 19:37:35 -0000 1.2 +++ aclocal.m4 8 May 2007 19:25:45 -0000 1.3 @@ -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/adminutil/configure,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure 4 Apr 2007 19:37:35 -0000 1.2 +++ configure 8 May 2007 19:25:45 -0000 1.3 @@ -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.0. +# Generated by GNU Autoconf 2.59 for adminutil 1.1.1. # # Report bugs to <http://bugzilla.redhat.com/>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='adminutil' PACKAGE_TARNAME='adminutil' -PACKAGE_VERSION='1.1.0' -PACKAGE_STRING='adminutil 1.1.0' +PACKAGE_VERSION='1.1.1' +PACKAGE_STRING='adminutil 1.1.1' 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 platform_defs debug_defs PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir sasl_inc sasl_lib icu_inc icu_lib icu_libdir icu_bin WINNT_TRUE WINNT_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 platform_defs debug_defs PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir sasl_inc sasl_lib icu_inc icu_lib icu_libdir icu_bin WINNT_TRUE WINNT_FALSE 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 adminutil 1.1.0 to adapt to many kinds of systems. +\`configure' configures adminutil 1.1.1 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.0:";; + short | recursive ) echo "Configuration of adminutil 1.1.1:";; esac cat <<\_ACEOF @@ -1179,7 +1179,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -adminutil configure 1.1.0 +adminutil configure 1.1.1 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1193,7 +1193,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.0, which was +It was created by adminutil $as_me 1.1.1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1836,7 +1836,7 @@ # Define the identity of the package. PACKAGE='adminutil' - VERSION='1.1.0' + VERSION='1.1.1' cat >>confdefs.h <<_ACEOF @@ -3809,7 +3809,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 @@ -3844,7 +3843,6 @@ fi SED=$lt_cv_path_SED - echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -4285,7 +4283,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4288 "configure"' > conftest.$ac_ext + echo '#line 4286 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5420,7 +5418,7 @@ # Provide some information about the compiler. -echo "$as_me:5423:" \ +echo "$as_me:5421:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6483,11 +6481,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:6486: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6484: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6490: \$? = $ac_status" >&5 + echo "$as_me:6488: \$? = $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. @@ -6751,11 +6749,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:6754: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6752: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6758: \$? = $ac_status" >&5 + echo "$as_me:6756: \$? = $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. @@ -6855,11 +6853,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:6858: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6856: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6862: \$? = $ac_status" >&5 + echo "$as_me:6860: \$? = $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 @@ -8320,31 +8318,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 8327 "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 @@ -9221,7 +9198,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9224 "configure" +#line 9201 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9321,7 +9298,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9324 "configure" +#line 9301 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9652,9 +9629,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -9788,11 +9762,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects # Dependencies to place before the objects being linked to create a # shared library. @@ -9804,7 +9778,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 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -9884,7 +9858,7 @@ link_all_deplibs=$link_all_deplibs # 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 @@ -11664,11 +11638,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:11667: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11641: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11671: \$? = $ac_status" >&5 + echo "$as_me:11645: \$? = $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. @@ -11768,11 +11742,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:11771: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11745: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11775: \$? = $ac_status" >&5 + echo "$as_me:11749: \$? = $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 @@ -12300,31 +12274,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 12307 "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 @@ -12708,9 +12661,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 @@ -12844,11 +12794,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. @@ -12860,7 +12810,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 @@ -12940,7 +12890,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 @@ -13362,11 +13312,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:13365: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13315: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13369: \$? = $ac_status" >&5 + echo "$as_me:13319: \$? = $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. @@ -13466,11 +13416,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:13469: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13419: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13473: \$? = $ac_status" >&5 + echo "$as_me:13423: \$? = $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 @@ -14911,31 +14861,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 14918 "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 @@ -15319,9 +15248,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 @@ -15455,11 +15381,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. @@ -15471,7 +15397,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 @@ -15551,7 +15477,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 @@ -15693,11 +15619,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:15696: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15622: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15700: \$? = $ac_status" >&5 + echo "$as_me:15626: \$? = $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. @@ -15961,11 +15887,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:15964: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15890: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15968: \$? = $ac_status" >&5 + echo "$as_me:15894: \$? = $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. @@ -16065,11 +15991,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:16068: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15994: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16072: \$? = $ac_status" >&5 + echo "$as_me:15998: \$? = $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 @@ -17530,31 +17456,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 17537 "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 @@ -17938,9 +17843,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 @@ -18074,11 +17976,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. @@ -18090,7 +17992,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 @@ -18170,7 +18072,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 @@ -18422,9 +18324,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 @@ -18558,11 +18457,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. @@ -18574,7 +18473,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 @@ -18654,7 +18553,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 @@ -24298,7 +24197,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by adminutil $as_me 1.1.0, which was +This file was extended by adminutil $as_me 1.1.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24356,7 +24255,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -adminutil config.status 1.1.0 +adminutil config.status 1.1.1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -24609,7 +24508,6 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@SED@,$SED,;t t s,@EGREP@,$EGREP,;t t s,@LN_S@,$LN_S,;t t s,@ECHO@,$ECHO,;t t Index: configure.ac =================================================================== RCS file: /cvs/dirsec/adminutil/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure.ac 4 Apr 2007 19:37:36 -0000 1.2 +++ configure.ac 8 May 2007 19:25:45 -0000 1.3 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([adminutil], [1.1.0], [http://bugzilla.redhat.com/]) +AC_INIT([adminutil], [1.1.1], [http://bugzilla.redhat.com/]) AM_INIT_AUTOMAKE([1.9 foreign subdir-objects]) AM_MAINTAINER_MODE AC_CANONICAL_HOST Index: ltmain.sh =================================================================== RCS file: /cvs/dirsec/adminutil/ltmain.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ltmain.sh 4 Apr 2007 19:37:36 -0000 1.2 +++ ltmain.sh 8 May 2007 19:25:45 -0000 1.3 @@ -46,16 +46,10 @@ VERSION=1.5.22 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes. +if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi # Check that we have a working $echo. @@ -111,14 +105,12 @@ # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). # We save the old values to restore during execute mode. -for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - fi" -done +if test "${LC_ALL+set}" = set; then + save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL +fi +if test "${LANG+set}" = set; then + save_LANG="$LANG"; LANG=C; export LANG +fi # Make sure IFS has a sensible default lt_nl=' @@ -144,8 +136,6 @@ preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 ##################################### # Shell function definitions: @@ -337,17 +327,7 @@ *) my_xabs=`pwd`"/$my_xlib" ;; esac my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - extracted_serial=`expr $extracted_serial + 1` - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir="$my_gentop/$my_xlib" $show "${rm}r $my_xdir" $run ${rm}r "$my_xdir" @@ -778,7 +758,6 @@ *.f90) xform=f90 ;; *.for) xform=for ;; *.java) xform=java ;; - *.obj) xform=obj ;; esac libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` @@ -1159,9 +1138,8 @@ for arg do case $arg in - -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) + -all-static | -static) + if test "X$arg" = "X-all-static"; then if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 fi @@ -1169,20 +1147,12 @@ dlopen_self=$dlopen_self_static fi prefer_static_libs=yes - ;; - -static) + else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac + fi build_libtool_libs=no build_old_libs=yes break @@ -1742,7 +1712,7 @@ continue ;; - -static | -static-libtool-libs) + -static) # The effects of -static are defined in a previous loop. # We used to do the same as -all-static on platforms that # didn't have a PIC flag, but the assumption that the effects @@ -2520,9 +2490,7 @@ if test "$linkmode,$pass" = "prog,link"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then # We need to hardcode the library path if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then # Make sure the rpath contains only unique directories. @@ -3218,7 +3186,7 @@ # which has an extra 1 added just for fun # case $version_type in - darwin|linux|osf|windows|none) + darwin|linux|osf|windows) current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_revision" @@ -3442,11 +3410,11 @@ fi # Eliminate all temporary directories. -# for path in $notinst_path; do -# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` -# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` -# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` -# done + for path in $notinst_path; do + lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` + done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. @@ -3547,12 +3515,13 @@ int main() { return 0; } EOF $rm conftest - if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then + $LTCC $LTCFLAGS -o conftest conftest.c $deplibs + if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do name=`expr $i : '-l$.*$'` # If $name is empty we are operating on a -L argument. - if test "$name" != "" && test "$name" != "0"; then + if test "$name" != "" && test "$name" -ne "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) @@ -3591,7 +3560,9 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - if $LTCC $LTCFLAGS -o conftest conftest.c $i; then + $LTCC $LTCFLAGS -o conftest conftest.c $i + # Did it work? + if test "$?" -eq 0 ; then ldd_output=`ldd conftest` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in @@ -3623,7 +3594,7 @@ droppeddeps=yes $echo $echo "*** Warning! Library $i is needed by this library but I was not able to" - $echo "*** make it link in! You will probably need to install it or some" + $echo "*** make it link in! You will probably need to install it or some" $echo "*** library that it depends on before this library will be fully" $echo "*** functional. Installing it before continuing would be even better." fi @@ -4268,14 +4239,12 @@ reload_conv_objs= gentop= # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. + # -Wl from whole_archive_flag_spec wl= if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" else gentop="$output_objdir/${obj}x" generated="$generated $gentop" @@ -4723,16 +4692,16 @@ case $host in *cygwin* | *mingw* ) if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` else - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"` fi ;; * ) - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"` ;; esac ;; @@ -4747,13 +4716,13 @@ # really was required. # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` + compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` fi if test "$need_relink" = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` + compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. @@ -4840,7 +4809,7 @@ if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` + relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` else # fast_install is set to needless relink_command= @@ -4877,7 +4846,7 @@ fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` + relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` fi # Quote $echo for shipping. @@ -5284,18 +5253,6 @@ Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi - # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH @@ -5438,7 +5395,7 @@ ;; esac $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \$*\" + \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" exit $EXIT_FAILURE fi else @@ -5624,7 +5581,7 @@ done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` + relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -5969,9 +5926,9 @@ if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` + relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` + relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi $echo "$modename: warning: relinking \`$file'" 1>&2 @@ -6180,7 +6137,7 @@ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` + relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` $show "$relink_command" if $run eval "$relink_command"; then : @@ -6456,15 +6413,12 @@ fi # Restore saved environment variables - for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - else - $lt_unset $lt_var - fi" - done - + if test "${save_LC_ALL+set}" = set; then + LC_ALL="$save_LC_ALL"; export LC_ALL + fi + if test "${save_LANG+set}" = set; then + LANG="$save_LANG"; export LANG + fi # Now prepare to actually exec the command. exec_cmd="\$cmd$args" @@ -6821,9 +6775,9 @@ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE + try to export only the symbols listed in SYMFILE -export-symbols-regex REGEX - try to export only the symbols matching REGEX + try to export only the symbols matching REGEX -LLIBDIR search LIBDIR for required installed libraries -lNAME OUTPUT-FILE requires the installed library libNAME -module build a library that can dlopened @@ -6837,11 +6791,9 @@ -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries + -static do not do any dynamic linking of libtool libraries -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] + specify library version info [each variable defaults to 0] All other options (arguments beginning with \`-') are ignored.

15 years, 10 months

1
0
0 / 0

[Fedora-directory-commits] adminutil/tests setup.sh,1.1,1.2

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminutil/tests In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20266/tests Modified Files: setup.sh Log Message: bump version to 1.1.1 Index: setup.sh =================================================================== RCS file: /cvs/dirsec/adminutil/tests/setup.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- setup.sh 4 Apr 2007 19:37:47 -0000 1.1 +++ setup.sh 8 May 2007 19:25:45 -0000 1.2 @@ -1,7 +1,8 @@ #!/bin/sh testdir="$1" -sroot=/home/$USER/11srv +#sroot=/home/$USER/11srv +sroot=/export/rmeggins/11srv port=1100 secport=1101 rootdn="cn=directory manager" @@ -12,6 +13,8 @@ needdata=1 #usessl=1 secdir=/path/to/etc/fedora-ds/slapd-localhost +PATH=/usr/lib64/mozldap:$PATH +export PATH if [ "$needinstance" ] ; then $sroot/bin/ds_newinst.pl - <<EOF @@ -73,8 +76,8 @@ run $dir/testtmp $secdir < $pwpfile EOF -#VALGRIND="valgrind --log-file=/var/tmp/vg.out --tool=memcheck --leak-check=yes --suppressions=/path/to/valgrind.supp --num-callers=40 " -#GDB="gdb -x .gdbinit " +VALGRIND="valgrind --log-file=/var/tmp/vg.out --tool=memcheck --leak-check=yes --suppressions=/home/rmeggins/valgrind.supp --num-callers=40 " +GDB="gdb -x .gdbinit " NOSSLTESTS="retrieveSIE psetread psetwrite" SSLTESTS="retrieveSIEssl psetreadssl" @@ -84,7 +87,7 @@ TESTS="$NOSSLTESTS" fi for test in $TESTS ; do -# ./libtool --mode execute $GDB ./$test +# ./libtool --mode execute $GDB ./$test cat $pwpfile | ./libtool --mode execute $VALGRIND ./$test $dir/testtmp $secdir done

15 years, 10 months

1
0
0 / 0

[Fedora-directory-commits] adminutil/lib/libadminutil admutil.c, 1.7, 1.8 form_post.c, 1.4, 1.5 psetc.c, 1.4, 1.5 resource.c, 1.2, 1.3 srvutil.c, 1.3, 1.4 uginfo.c, 1.4, 1.5

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminutil/lib/libadminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19482/adminutil/lib/libadminutil Modified Files: admutil.c form_post.c psetc.c resource.c srvutil.c uginfo.c Log Message: Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use 5) small memory error in the new code in resource.c - does not affect any released code. Make sure the buffer is correctly null terminated. Also, clean up a small memory leak. 6) small memory leaks in various places in uginfo.c - also changed some code to use PR_smprintf instead of fixed size buffers. Fixed memory leaks. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: admutil.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/admutil.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- admutil.c 4 Apr 2007 19:37:36 -0000 1.7 +++ admutil.c 8 May 2007 19:13:25 -0000 1.8 @@ -77,11 +77,13 @@ const char *path /* path given by caller */ ) { - char *retval = NULL; + char *retval = NULL; char *adminutilConfDir = getenv(ADMINUTIL_CONFDIR_ENV_VAR); - /* try given path */ - retval = PR_smprintf("%s/%s", path, filename); + /* try given path */ + if (path) { + retval = PR_smprintf("%s/%s", path, filename); + } if (!is_file_ok(retval) && adminutilConfDir) { PR_smprintf_free(retval); retval = PR_smprintf("%s/%s", adminutilConfDir, filename); @@ -91,7 +93,7 @@ } } - return retval; + return retval; } /* Copy from libadmin..... */ @@ -848,16 +850,20 @@ else if (result > 0) { if (node->left) { flag = treeRemoveNode(node->left, name, &remove); - if (remove) PR_Free(node->left); - node->left = NULL; + if (remove) { + PR_Free(node->left); + node->left = NULL; + } } else flag = ADMUTIL_OP_FAIL; /* Can't find the node */ } else { if (node->right) { flag = treeRemoveNode(node->right, name, &remove); - if (remove) PR_Free(node->right); - node->right = NULL; + if (remove) { + PR_Free(node->right); + node->right = NULL; + } } else flag = ADMUTIL_OP_FAIL; /* Can't find the node */ } Index: form_post.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/form_post.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- form_post.c 4 Apr 2007 19:37:36 -0000 1.4 +++ form_post.c 8 May 2007 19:13:25 -0000 1.5 @@ -152,6 +152,7 @@ vars[cl] = '\0'; input = string_to_vec(vars); + PL_strfree(vars); /* string_to_vec dups it */ } PR_IMPLEMENT(void) Index: psetc.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/psetc.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- psetc.c 4 Apr 2007 19:37:36 -0000 1.4 +++ psetc.c 8 May 2007 19:13:25 -0000 1.5 @@ -31,6 +31,7 @@ #include "psetc_pvt.h" #include "libadminutil/admutil.h" #include "libadminutil/distadm.h" +#include "libadminutil/srvutil.h" #include "dbtadmutil.h" #include <ldap_ssl.h> @@ -1316,12 +1317,13 @@ psetCreate(char* serverID, char* configRoot, char* user, char* passwd, int* errorcode) { - PsetHndl pset; + PsetHndl pset = NULL; AdmldapInfo ldapInfo= NULL; - char *path, *ldapHost=NULL, *sieDN = NULL; + char *path = NULL, *ldapHost=NULL, *sieDN = NULL; char *userDN = NULL; char *bindPasswd = NULL; int ldapPort = -1; + int useLocalConf = 1; ldapInfo = admldapBuildInfo(configRoot, errorcode); @@ -1336,8 +1338,20 @@ if (!ldapHost) ldapHost = PL_strdup("localhost"); if (ldapPort < 0) ldapPort = 389; - /* Get SIE and password */ - sieDN = admldapGetSIEDN(ldapInfo); + /* if server is admin-serv, then the ldapInfo sieDN is the correct sieDN */ + if (!serverID || !PL_strncasecmp(serverID, "admin-serv", strlen("admin-serv"))) { + sieDN = admldapGetSIEDN(ldapInfo); + } else { /* given other serverID */ + sieDN = findSIEDNByID(ldapInfo, serverID); + if (!sieDN) { + *errorcode = PSET_ENTRY_NOT_EXIST; + goto done; + } + useLocalConf = 0; /* disallow local.conf creation - will overwrite admin server one */ + /* use psetRealCreate to pass in a conf file */ + } + + /* Get user dn and password */ if (!user) { ADM_GetUserDNString(errorcode, &user); } @@ -1357,13 +1371,15 @@ } /* find local.conf file */ - if (!(path = find_file_in_paths("local.conf", configRoot))) { + if (useLocalConf && + !(path = find_file_in_paths("local.conf", configRoot))) { /* error - no valid file or dir could be found */ *errorcode = PSET_ENV_ERR; } pset = psetRealCreate(ldapHost, ldapPort, sieDN, userDN, bindPasswd, path, errorcode); +done: PR_Free(ldapHost); PR_Free(sieDN); PR_smprintf_free(path); Index: resource.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/resource.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- resource.c 4 Apr 2007 19:37:36 -0000 1.2 +++ resource.c 8 May 2007 19:13:25 -0000 1.3 @@ -192,7 +192,7 @@ there may be truncation/overflow - see below */ msglen = (int32_t)bufsize; u_strToUTF8(buffer, msglen, &msglen, umsg, umsglen, &status); - buffer[bufsize] = '\0'; /* ensure null termination */ + buffer[bufsize-1] = '\0'; /* ensure null termination */ } else { /* Get first the required buffer size */ u_strToUTF8(NULL, 0, &msglen, umsg, umsglen, &status); @@ -204,7 +204,10 @@ /* now the real conversion with allocated buffer */ u_strToUTF8((char*)result, msglen+1, &msglen, umsg, umsglen, &status); if (!U_SUCCESS(status)) { + PR_Free(result); result = NULL; + } else { + result[msglen] = '\0'; } } } Index: srvutil.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/srvutil.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- srvutil.c 4 Apr 2007 19:37:36 -0000 1.3 +++ srvutil.c 8 May 2007 19:13:25 -0000 1.4 @@ -237,3 +237,36 @@ return resultList; } + +#define IS_A_DELIMITER(x) ((x == ',') || (x == ' ') || (x == '+') || (x == '\0')) + +PR_IMPLEMENT(char *) +findSIEDNByID(AdmldapInfo info, const char *serverID) +{ + char *retval = NULL; + AttrNameList nl = getServerDNList(info); + + if (nl) { + size_t len = strlen(serverID); + AttrNameList nlptr = nl; + while (retval = *nlptr++) { + /* nl is a list of DNs like this: + cn=slapd-foo, ... + cn=slapd-bar,... + cn=admin-serv-localhost, + ... + serverID is the value of the cn - we have to look for the trailing + delimiter to distinguish between slapd-foo slapd-foo2 + */ + if ((len <= strlen(retval+3)) && + !PL_strncasecmp(retval+3, serverID, len) && + (IS_A_DELIMITER(retval[3+len]))) { + retval = PL_strdup(retval); + break; + } + } + deleteAttrNameList(nl); + } + + return retval; +} Index: uginfo.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/uginfo.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- uginfo.c 4 Apr 2007 19:37:36 -0000 1.4 +++ uginfo.c 8 May 2007 19:13:25 -0000 1.5 @@ -85,6 +85,7 @@ 0, &result)) != LDAP_SUCCESS ) { + ldap_msgfree(result); #ifdef LDAP_DEBUG ldap_perror(ld, "ldap_search_s"); #endif @@ -104,6 +105,7 @@ if (ldap_count_entries(ld, result) == 0) { /* error return : entry does not exist */ *error_code = UG_ENTRY_NOT_EXIST; + ldap_msgfree(result); return 0; } @@ -128,10 +130,10 @@ } else { PR_snprintf(buffer, sizeof(buffer), "%s %s", directoryURLVals[0], s[0]); } - ldap_value_free(s); } else { PR_snprintf(buffer, sizeof(buffer), "%s", directoryURLVals[0]); } + ldap_value_free(s); *directoryURL = PL_strdup(buffer); ldap_value_free(directoryURLVals); @@ -149,6 +151,7 @@ ldap_value_free(directoryInfoRefVals); } + ldap_msgfree(result); return 1; } @@ -158,20 +161,20 @@ { char** dnList; int dnLen = 0; - char dnbuf[1024]; + char *dnbuf = NULL; dnList = ldap_explode_dn(sieDN, 0); - while (dnList[dnLen]) dnLen++; + while (dnList && dnList[dnLen]) dnLen++; - if (dnLen <5) return NULL; - PR_snprintf(dnbuf, sizeof(dnbuf), - "%s,%s,%s,%s", + if (dnLen >= 5) { + dnbuf = PR_smprintf("%s,%s,%s,%s", dnList[dnLen-4], dnList[dnLen-3], dnList[dnLen-2], dnList[dnLen-1]); - - return PL_strdup(dnbuf); + } + ldap_value_free(dnList); + return dnbuf; } static char* @@ -179,18 +182,19 @@ { char** dnList; int dnLen = 0; - char dnbuf[1024]; + char *dnbuf = NULL; dnList = ldap_explode_dn(sieDN, 0); - while (dnList[dnLen]) dnLen++; + while (dnList && dnList[dnLen]) dnLen++; - if (dnLen < 3) return NULL; - PR_snprintf(dnbuf, sizeof(dnbuf), - "cn=UserDirectory, ou=Global Preferences,%s,%s", + if (dnLen >= 3) { + dnbuf = PR_smprintf("cn=UserDirectory, ou=Global Preferences,%s,%s", dnList[dnLen-2], dnList[dnLen-1]); + } + ldap_value_free(dnList); - return PL_strdup(dnbuf); + return dnbuf; }

15 years, 10 months

1
0
0 / 0

[Fedora-directory-commits] adminutil/tests nsroot.ldif, 1.1, 1.2 psetread.c, 1.1, 1.2 psetreadssl.c, 1.1, 1.2 psetwrite.c, 1.1, 1.2 retrieveSIEssl.c, 1.1, 1.2

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminutil/tests In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19482/adminutil/tests Modified Files: nsroot.ldif psetread.c psetreadssl.c psetwrite.c retrieveSIEssl.c Log Message: Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use 5) small memory error in the new code in resource.c - does not affect any released code. Make sure the buffer is correctly null terminated. Also, clean up a small memory leak. 6) small memory leaks in various places in uginfo.c - also changed some code to use PR_smprintf instead of fixed size buffers. Fixed memory leaks. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: nsroot.ldif =================================================================== RCS file: /cvs/dirsec/adminutil/tests/nsroot.ldif,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nsroot.ldif 4 Apr 2007 19:37:47 -0000 1.1 +++ nsroot.ldif 8 May 2007 19:13:26 -0000 1.2 @@ -2,6 +2,7 @@ # entry-id: 1 dn: o=NetscapeRoot +nsUniqueId: 5131a203-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: organization o: NetscapeRoot @@ -9,13 +10,13 @@ modifiersName: cn=directory manager createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a203-1dd211b2-8008e98c-0e470000 aci: (targetattr="*")(version 3.0; acl "Enable Configuration Administrator Group modification"; allow (all) groupdn="ldap:///cn=Configuration Administrators, ou=Groups, ou=TopologyManagement, o=NetscapeRoot";) aci: (targetattr="*")(targetfilter=(o=NetscapeRoot))(version 3.0; acl "Default anonymous access"; allow (read, search) userdn="ldap:///anyone";) aci: (targetattr="*")(version 3.0; acl "Enable Group Expansion"; allow (read, search, compare) groupdnattr="uniquemember";) # entry-id: 2 dn: ou=TopologyManagement, o=NetscapeRoot +nsUniqueId: 5131a204-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: organizationalunit ou: TopologyManagement @@ -24,11 +25,11 @@ modifiersName: cn=directory manager createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a204-1dd211b2-8008e98c-0e470000 aci: (targetattr!="userPassword")(version 3.0; acl "Enable anonymous access"; allow (read, search, compare)userdn="ldap:///anyone";) # entry-id: 3 dn: ou=Groups, ou=TopologyManagement, o=NetscapeRoot +nsUniqueId: 5131a205-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: organizationalunit ou: Groups @@ -37,10 +38,10 @@ modifiersName: cn=directory manager createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a205-1dd211b2-8008e98c-0e470000 # entry-id: 4 dn: ou=Administrators, ou=TopologyManagement, o=NetscapeRoot +nsUniqueId: 5131a206-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: organizationalunit ou: Administrators @@ -49,10 +50,10 @@ modifiersName: cn=directory manager createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a206-1dd211b2-8008e98c-0e470000 # entry-id: 5 dn: cn=Configuration Administrators, ou=Groups, ou=TopologyManagement, o=NetscapeRoot +nsUniqueId: 5131a207-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: groupofuniquenames cn: Configuration Administrators @@ -60,11 +61,11 @@ modifiersName: cn=directory manager createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a207-1dd211b2-8008e98c-0e470000 uniqueMember: uid=admin,ou=Administrators, ou=TopologyManagement, o=NetscapeRoot # entry-id: 6 dn: uid=admin, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot +nsUniqueId: 5131a208-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: person objectClass: organizationalperson @@ -79,10 +80,10 @@ modifiersName: cn=directory manager createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a208-1dd211b2-8008e98c-0e470000 # entry-id: 7 dn: ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a209-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: organizationalunit objectClass: nsadmindomain @@ -93,11 +94,11 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172952Z -nsUniqueId: 5131a209-1dd211b2-8008e98c-0e470000 aci: (targetattr=*)(targetfilter=(ou=localdomain))(version 3.0; acl "Enable anonymous access"; allow(read,search) userdn="ldap:///anyone";) # entry-id: 8 dn: ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a20a-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: organizationalunit ou: Global Preferences @@ -105,12 +106,12 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307174048Z -nsUniqueId: 5131a20a-1dd211b2-8008e98c-0e470000 aci: (targetattr=*)(version 3.0; acl "Enable anonymous access"; allow(read,search) userdn="ldap:///anyone";) description: Default branch for Fedora Server Products Global Preferences # entry-id: 9 dn: ou=Host Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a20b-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: organizationalunit ou: Host Preferences @@ -118,10 +119,10 @@ modifiersName: cn=directory manager createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a20b-1dd211b2-8008e98c-0e470000 # entry-id: 10 dn: cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a20c-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsHost objectClass: groupOfUniqueNames @@ -134,11 +135,11 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a20c-1dd211b2-8008e98c-0e470000 uniqueMember: cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot # entry-id: 11 dn: cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a20d-1dd211b2-8008e98c-0e470000 objectClass: nsAdminGroup objectClass: groupOfUniqueNames objectClass: nsDirectoryInfo @@ -154,12 +155,12 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a20d-1dd211b2-8008e98c-0e470000 uniqueMember: cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot uniqueMember: cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot # entry-id: 12 dn: cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a20e-1dd211b2-8008e98c-0e470000 objectClass: nsApplication objectClass: groupOfUniqueNames objectClass: top @@ -178,13 +179,13 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a20e-1dd211b2-8008e98c-0e470000 uniqueMember: cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot nsServerMigrationClassname: com.netscape.admin.dirserv.task.MigrateCreate@ds11.jar(a)cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot nsServerCreationClassname: com.netscape.admin.dirserv.task.MigrateCreate@ds11.jar(a)cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot # entry-id: 13 dn: cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a20f-1dd211b2-8008e98c-0e470000 objectClass: netscapeServer objectClass: nsDirectoryServer objectClass: nsResourceRef @@ -213,10 +214,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a20f-1dd211b2-8008e98c-0e470000 # entry-id: 14 dn: cn=configuration,cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a210-1dd211b2-8008e98c-0e470000 objectClass: nsResourceRef objectClass: nsAdminObject objectClass: nsDirectoryInfo @@ -230,10 +231,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a210-1dd211b2-8008e98c-0e470000 # entry-id: 15 dn: cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a211-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef cn: Tasks @@ -241,10 +242,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a211-1dd211b2-8008e98c-0e470000 # entry-id: 16 dn: cn=Operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a212-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstaskgroup nsTaskLabel: Operation Tasks Group @@ -253,10 +254,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a212-1dd211b2-8008e98c-0e470000 # entry-id: 17 dn: cn=task summary, cn=Operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a213-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsConfig description: start stop restart Backup Restore KeyCert Authenticate CompleteImport CompleteExport @@ -265,10 +266,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a213-1dd211b2-8008e98c-0e470000 # entry-id: 18 dn: cn=start, cn=Operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a214-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -279,10 +280,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a214-1dd211b2-8008e98c-0e470000 # entry-id: 19 dn: cn=stop, cn=Operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a215-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -293,10 +294,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a215-1dd211b2-8008e98c-0e470000 # entry-id: 20 dn: cn=restart, cn=Operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a216-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -307,10 +308,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a216-1dd211b2-8008e98c-0e470000 # entry-id: 21 dn: cn=Backup, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a217-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -321,10 +322,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a217-1dd211b2-8008e98c-0e470000 # entry-id: 22 dn: cn=Restore, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a218-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -335,10 +336,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172853Z modifyTimestamp: 20070307172853Z -nsUniqueId: 5131a218-1dd211b2-8008e98c-0e470000 # entry-id: 23 dn: cn=KeyCert, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a219-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -348,10 +349,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a219-1dd211b2-8008e98c-0e470000 # entry-id: 24 dn: cn=Authenticate, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a21a-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -361,10 +362,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a21a-1dd211b2-8008e98c-0e470000 # entry-id: 25 dn: cn=CompleteImport, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a21b-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -374,10 +375,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a21b-1dd211b2-8008e98c-0e470000 # entry-id: 26 dn: cn=CompleteExport, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a21c-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -387,10 +388,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a21c-1dd211b2-8008e98c-0e470000 # entry-id: 27 dn: cn=Export, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a21d-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -400,10 +401,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a21d-1dd211b2-8008e98c-0e470000 # entry-id: 28 dn: cn=Import, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a21e-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -413,10 +414,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a21e-1dd211b2-8008e98c-0e470000 # entry-id: 29 dn: cn=ViewLog, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a21f-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -426,10 +427,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a21f-1dd211b2-8008e98c-0e470000 # entry-id: 30 dn: cn=ListBackups, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a220-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -439,10 +440,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a220-1dd211b2-8008e98c-0e470000 # entry-id: 31 dn: cn=Remove, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a221-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -452,10 +453,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a221-1dd211b2-8008e98c-0e470000 # entry-id: 32 dn: cn=CreateVLVIndex, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a222-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -465,10 +466,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a222-1dd211b2-8008e98c-0e470000 # entry-id: 33 dn: cn=AddIndex, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a223-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -478,10 +479,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a223-1dd211b2-8008e98c-0e470000 # entry-id: 34 dn: cn=SNMPCtrl, cn=operation, cn=Tasks, cn=slapd-localhost, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a224-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -491,10 +492,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a224-1dd211b2-8008e98c-0e470000 # entry-id: 35 dn: cn=Tasks, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a225-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef cn: Tasks @@ -502,10 +503,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a225-1dd211b2-8008e98c-0e470000 # entry-id: 36 dn: cn=Operation, cn=Tasks, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a226-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstaskgroup nsTaskLabel: Operation Tasks Group @@ -514,10 +515,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a226-1dd211b2-8008e98c-0e470000 # entry-id: 37 dn: cn=Migrate, cn=Operation, cn=Tasks, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a227-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -527,10 +528,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a227-1dd211b2-8008e98c-0e470000 # entry-id: 38 dn: cn=Create, cn=Operation, cn=Tasks, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a228-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -540,10 +541,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a228-1dd211b2-8008e98c-0e470000 # entry-id: 39 dn: cn=GetConfigInfo, cn=Operation, cn=Tasks, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a229-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -553,10 +554,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a229-1dd211b2-8008e98c-0e470000 # entry-id: 40 dn: cn=MigrateLocalDB, cn=Operation, cn=Tasks, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a22a-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -566,10 +567,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a22a-1dd211b2-8008e98c-0e470000 # entry-id: 41 dn: ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a22b-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: organizationalUnit objectClass: extensibleObject @@ -579,10 +580,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307174048Z -nsUniqueId: 5131a22b-1dd211b2-8008e98c-0e470000 # entry-id: 42 dn: ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a22c-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: organizationalunit objectClass: extensibleObject @@ -592,10 +593,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307174048Z -nsUniqueId: 5131a22c-1dd211b2-8008e98c-0e470000 # entry-id: 43 dn: cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a22d-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef objectClass: extensibleObject @@ -605,10 +606,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307174048Z -nsUniqueId: 5131a22d-1dd211b2-8008e98c-0e470000 # entry-id: 44 dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a22e-1dd211b2-8008e98c-0e470000 cn: nsroledefinition objectClass: top objectClass: extensibleObject @@ -623,10 +624,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307174048Z -nsUniqueId: 5131a22e-1dd211b2-8008e98c-0e470000 # entry-id: 45 dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a22f-1dd211b2-8008e98c-0e470000 cn: cossuperdefinition objectClass: top objectClass: extensibleObject @@ -641,10 +642,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307174048Z -nsUniqueId: 5131a22f-1dd211b2-8008e98c-0e470000 # entry-id: 46 dn: cn=UserDirectory, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a230-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsDirectoryInfo cn: UserDirectory @@ -654,10 +655,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a230-1dd211b2-8008e98c-0e470000 # entry-id: 47 dn: cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a238-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsApplication objectClass: groupOfUniqueNames @@ -676,11 +677,11 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a238-1dd211b2-8008e98c-0e470000 uniqueMember: cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot # entry-id: 48 dn: cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a239-1dd211b2-8008e98c-0e470000 passwordExpirationTime: 20380118031417 objectClass: top objectClass: netscapeServer @@ -701,10 +702,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a239-1dd211b2-8008e98c-0e470000 # entry-id: 49 dn: cn=configuration, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a23a-1dd211b2-8008e98c-0e470000 objectClass: nsConfig objectClass: nsAdminConfig objectClass: nsAdminObject @@ -714,16 +715,16 @@ nsServerPort: 32348 nsSuiteSpotUser: root nsServerAddress: -nsAdminEnableEnduser: on -nsAdminEnableDSGW: on +nsAdminEnableEnduser: new value +nsAdminEnableDSGW: new value nsDirectoryInfoRef: cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot nsAdminUsers: admin-serv/config/admpw nsErrorLog: admin-serv/logs/error nsPidLog: admin-serv/logs/pid nsAccessLog: admin-serv/logs/access -nsAdminCacheLifetime: 600 -nsAdminAccessHosts: *.localdomain -nsAdminAccessAddresses: * +nsAdminCacheLifetime: new value +nsAdminAccessHosts: new value +nsAdminAccessAddresses: new value nsAdminOneACLDir: adminacl aci: (targetattr=*)(version 3.0; acl "Enable delegated admin to access configuration"; allow (read,search) groupdn="ldap:///cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot";) aci: (targetattr=*)(version 3.0; acl "Enable Server configuration"; allow (all) groupdn="ldap:///cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot";) @@ -732,11 +733,11 @@ creatorsName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z -modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a23a-1dd211b2-8008e98c-0e470000 +modifyTimestamp: 20070418172330Z # entry-id: 50 dn: cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a23b-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef cn: Tasks @@ -744,10 +745,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a23b-1dd211b2-8008e98c-0e470000 # entry-id: 51 dn: cn=Operation, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a23c-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstaskgroup nsTaskLabel: Operation Tasks Group @@ -756,10 +757,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a23c-1dd211b2-8008e98c-0e470000 # entry-id: 52 dn: cn=Stop, cn=Operation, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a23d-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -771,10 +772,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a23d-1dd211b2-8008e98c-0e470000 # entry-id: 53 dn: cn=Restart, cn=Operation, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a23e-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -786,10 +787,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a23e-1dd211b2-8008e98c-0e470000 # entry-id: 54 dn: cn=Authenticate, cn=Operation, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a23f-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask nsHelpRef: admin/userauth.html @@ -799,10 +800,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a23f-1dd211b2-8008e98c-0e470000 # entry-id: 55 dn: cn=ListOldServers, cn=Operation, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a240-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -812,10 +813,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a240-1dd211b2-8008e98c-0e470000 # entry-id: 56 dn: cn=StartConfigDS, cn=Operation, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a241-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask nsExecRef: start_config_ds @@ -824,10 +825,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a241-1dd211b2-8008e98c-0e470000 # entry-id: 57 dn: cn=MigrateConfig, cn=Operation, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a242-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -837,10 +838,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a242-1dd211b2-8008e98c-0e470000 # entry-id: 58 dn: cn=MergeConfig, cn=Operation, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a243-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -850,10 +851,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a243-1dd211b2-8008e98c-0e470000 # entry-id: 59 dn: cn=StatusPing, cn=Operation, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a244-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -864,10 +865,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a244-1dd211b2-8008e98c-0e470000 # entry-id: 60 dn: cn=Configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a245-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstaskgroup nsTaskLabel: Configuration Tasks Group @@ -876,10 +877,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a245-1dd211b2-8008e98c-0e470000 # entry-id: 61 dn: cn=ServerSetup, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a246-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -890,10 +891,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a246-1dd211b2-8008e98c-0e470000 # entry-id: 62 dn: cn=DirectorySetup, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a247-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -903,10 +904,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a247-1dd211b2-8008e98c-0e470000 # entry-id: 63 dn: cn=UGDirectorySetup, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a248-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -916,10 +917,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a248-1dd211b2-8008e98c-0e470000 # entry-id: 64 dn: cn=AccessSetup, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a249-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -929,10 +930,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a249-1dd211b2-8008e98c-0e470000 # entry-id: 65 dn: cn=Logging, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a24a-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -944,10 +945,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a24a-1dd211b2-8008e98c-0e470000 # entry-id: 66 dn: cn=SecurityOp, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a24b-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -957,10 +958,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a24b-1dd211b2-8008e98c-0e470000 # entry-id: 67 dn: cn=CertSetup, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a24c-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -971,10 +972,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a24c-1dd211b2-8008e98c-0e470000 # entry-id: 68 dn: cn=SSLActivate, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a24d-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -985,10 +986,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a24d-1dd211b2-8008e98c-0e470000 # entry-id: 69 dn: cn=ReadLog, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a24e-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -999,10 +1000,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a24e-1dd211b2-8008e98c-0e470000 # entry-id: 70 dn: cn=HTMLAdmin, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a24f-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1013,10 +1014,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a24f-1dd211b2-8008e98c-0e470000 # entry-id: 71 dn: cn=StatPingServ, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a250-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1027,10 +1028,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a250-1dd211b2-8008e98c-0e470000 # entry-id: 72 dn: cn=ViewData, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a251-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1041,10 +1042,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a251-1dd211b2-8008e98c-0e470000 # entry-id: 73 dn: cn=ViewLog, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a252-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1055,10 +1056,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a252-1dd211b2-8008e98c-0e470000 # entry-id: 74 dn: cn=MonReplication, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a253-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1069,10 +1070,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a253-1dd211b2-8008e98c-0e470000 # entry-id: 75 dn: cn=repl-monitor-cgi.pl, cn=configuration, cn=Tasks, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a254-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1083,10 +1084,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a254-1dd211b2-8008e98c-0e470000 # entry-id: 76 dn: cn=Commands, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a255-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef cn: Commands @@ -1094,10 +1095,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a255-1dd211b2-8008e98c-0e470000 # entry-id: 77 dn: cn=sync-task-sie-data, cn=Commands, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a256-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask nsHelpRef: admin/sync-task-sie-data.html @@ -1107,10 +1108,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a256-1dd211b2-8008e98c-0e470000 # entry-id: 78 dn: cn=change-sie-password, cn=Commands, cn=admin-serv-localhost, cn=Fedora Administration Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a257-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask nsExecRef: runtime @@ -1119,10 +1120,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a257-1dd211b2-8008e98c-0e470000 # entry-id: 79 dn: ou=UserPreferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a258-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: organizationalUnit ou: UserPreferences @@ -1131,10 +1132,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a258-1dd211b2-8008e98c-0e470000 # entry-id: 80 dn: cn=Common, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a259-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef objectClass: nsGlobalParameters @@ -1152,10 +1153,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a259-1dd211b2-8008e98c-0e470000 # entry-id: 81 dn: cn=Client, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a25a-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef objectClass: nsAdminGlobalParameters @@ -1180,10 +1181,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a25a-1dd211b2-8008e98c-0e470000 # entry-id: 82 dn: cn=PublicViews, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a25b-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsAdminConsoleUser cn: PublicViews @@ -1192,10 +1193,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a25b-1dd211b2-8008e98c-0e470000 # entry-id: 83 dn: cn=CustomView, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a25c-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef cn: CustomView @@ -1203,10 +1204,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a25c-1dd211b2-8008e98c-0e470000 # entry-id: 84 dn: cn=inetorgPerson, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a25d-1dd211b2-8008e98c-0e470000 cn: inetorgPerson objectClass: nsResourceRef objectClass: nsAdminResourceEditorExtension @@ -1223,10 +1224,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a25d-1dd211b2-8008e98c-0e470000 # entry-id: 85 dn: cn=organizationalPerson, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a25e-1dd211b2-8008e98c-0e470000 cn: organizationalPerson objectClass: nsResourceRef objectClass: nsAdminResourceEditorExtension @@ -1241,10 +1242,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a25e-1dd211b2-8008e98c-0e470000 # entry-id: 86 dn: cn=groupofuniquenames, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a25f-1dd211b2-8008e98c-0e470000 cn: groupofuniquenames objectClass: nsResourceRef objectClass: nsAdminResourceEditorExtension @@ -1260,10 +1261,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a25f-1dd211b2-8008e98c-0e470000 # entry-id: 87 dn: cn=organizationalunit, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a260-1dd211b2-8008e98c-0e470000 cn: organizationalunit objectClass: nsResourceRef objectClass: nsAdminResourceEditorExtension @@ -1277,10 +1278,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a260-1dd211b2-8008e98c-0e470000 # entry-id: 88 dn: cn=defaultObjectClassesContainer, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a261-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef cn: DefaultObjectClassesContainer @@ -1288,10 +1289,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a261-1dd211b2-8008e98c-0e470000 # entry-id: 89 dn: cn=user, cn=defaultObjectClassesContainer, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a262-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef objectClass: nsdefaultObjectClasses @@ -1304,10 +1305,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a262-1dd211b2-8008e98c-0e470000 # entry-id: 90 dn: cn=group, cn=defaultObjectClassesContainer, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a263-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef objectClass: nsdefaultObjectClasses @@ -1318,10 +1319,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a263-1dd211b2-8008e98c-0e470000 # entry-id: 91 dn: cn=ou, cn=defaultObjectClassesContainer, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a264-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef objectClass: nsdefaultObjectClasses @@ -1332,10 +1333,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a264-1dd211b2-8008e98c-0e470000 # entry-id: 92 dn: cn=topologyplugin, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a265-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef objectClass: extensibleObject @@ -1345,10 +1346,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a265-1dd211b2-8008e98c-0e470000 # entry-id: 93 dn: cn=defaultplugin, cn=topologyplugin, ou=4.0, ou=Admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a266-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstopologyplugin objectClass: extensibleObject @@ -1360,10 +1361,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172854Z modifyTimestamp: 20070307172854Z -nsUniqueId: 5131a266-1dd211b2-8008e98c-0e470000 # entry-id: 94 dn: ou="uid=admin, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot",ou=UserPreferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a267-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: organizationalUnit aci: (targetattr=*)(version 3.0; acl "UserDNControl"; allow (all) userdnattr="creatorsname";) @@ -1372,10 +1373,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172916Z modifyTimestamp: 20070307172916Z -nsUniqueId: 5131a267-1dd211b2-8008e98c-0e470000 # entry-id: 95 dn: cn=UI,ou=4.0, ou=admin, ou=Global Preferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a268-1dd211b2-8008e98c-0e470000 cn: UI objectClass: top objectClass: nsAdminConsoleUser @@ -1383,10 +1384,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172916Z modifyTimestamp: 20070307172916Z -nsUniqueId: 5131a268-1dd211b2-8008e98c-0e470000 # entry-id: 96 dn: ou=Console,ou="uid=admin, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot",ou=UserPreferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a269-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: organizationalUnit ou: Console @@ -1394,10 +1395,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172916Z modifyTimestamp: 20070307172916Z -nsUniqueId: 5131a269-1dd211b2-8008e98c-0e470000 # entry-id: 97 dn: ou=4.0,ou=Console,ou="uid=admin, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot",ou=UserPreferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a26a-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: organizationalUnit ou: 4.0 @@ -1405,10 +1406,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172916Z modifyTimestamp: 20070307172916Z -nsUniqueId: 5131a26a-1dd211b2-8008e98c-0e470000 # entry-id: 98 dn: cn=General,ou=4.0,ou=Console,ou="uid=admin, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot",ou=UserPreferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a26b-1dd211b2-8008e98c-0e470000 cn: General objectClass: top objectClass: nsAdminConsoleUser @@ -1416,11 +1417,11 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172916Z modifyTimestamp: 20070307174343Z -nsUniqueId: 5131a26b-1dd211b2-8008e98c-0e470000 nsPreference:: IwojV2VkIE1hciAwNyAxMDo0Mzo0NCBNU1QgMjAwNwpXaWR0aD03NTAKU2hvd1N0YXR1c0Jhcj10cnVlClNob3dCYW5uZXJCYXI9dHJ1ZQpZPTE4NQpYPTIwMwpIZWlnaHQ9NTMwCg== # entry-id: 99 dn: cn=Fonts,ou=4.0,ou=Console,ou="uid=admin, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot",ou=UserPreferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a26c-1dd211b2-8008e98c-0e470000 cn: Fonts objectClass: top objectClass: nsAdminConsoleUser @@ -1428,10 +1429,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172916Z modifyTimestamp: 20070307172916Z -nsUniqueId: 5131a26c-1dd211b2-8008e98c-0e470000 # entry-id: 100 dn: cn=ResourcePage,ou=4.0,ou=Console,ou="uid=admin, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot",ou=UserPreferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a26d-1dd211b2-8008e98c-0e470000 cn: ResourcePage objectClass: top objectClass: nsAdminConsoleUser @@ -1439,11 +1440,11 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172916Z modifyTimestamp: 20070307174343Z -nsUniqueId: 5131a26d-1dd211b2-8008e98c-0e470000 nsPreference:: IwojV2VkIE1hciAwNyAxMDo0Mzo0NCBNU1QgMjAwNwpTaG93VHJlZT10cnVlCg== # entry-id: 101 dn: cn=CustomViews,ou=4.0,ou=Console,ou="uid=admin, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot",ou=UserPreferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 5131a26e-1dd211b2-8008e98c-0e470000 cn: CustomViews objectClass: top objectClass: nsAdminConsoleUser @@ -1451,10 +1452,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172916Z modifyTimestamp: 20070307172916Z -nsUniqueId: 5131a26e-1dd211b2-8008e98c-0e470000 -# entry-id: 105 +# entry-id: 102 dn: cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb04-1dd211b2-8008e98c-0e470000 objectClass: netscapeServer objectClass: nsDirectoryServer objectClass: nsResourceRef @@ -1483,11 +1484,11 @@ modifiersName: cn=server,cn=plugins,cn=config createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb04-1dd211b2-8008e98c-0e470000 passwordGraceUserTime: 0 -# entry-id: 106 +# entry-id: 103 dn: cn=configuration,cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb05-1dd211b2-8008e98c-0e470000 objectClass: nsResourceRef objectClass: nsAdminObject objectClass: nsDirectoryInfo @@ -1501,10 +1502,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb05-1dd211b2-8008e98c-0e470000 -# entry-id: 107 +# entry-id: 104 dn: cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb06-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsResourceRef cn: Tasks @@ -1512,10 +1513,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb06-1dd211b2-8008e98c-0e470000 -# entry-id: 108 +# entry-id: 105 dn: cn=Operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb07-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstaskgroup nsTaskLabel: Operation Tasks Group @@ -1524,10 +1525,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb07-1dd211b2-8008e98c-0e470000 -# entry-id: 109 +# entry-id: 106 dn: cn=task summary, cn=Operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb08-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nsConfig description: start stop restart Backup Restore KeyCert Authenticate CompleteImport CompleteExport @@ -1536,10 +1537,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb08-1dd211b2-8008e98c-0e470000 -# entry-id: 110 +# entry-id: 107 dn: cn=start, cn=Operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb09-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1550,10 +1551,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb09-1dd211b2-8008e98c-0e470000 -# entry-id: 111 +# entry-id: 108 dn: cn=stop, cn=Operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb0a-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1564,10 +1565,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb0a-1dd211b2-8008e98c-0e470000 -# entry-id: 112 +# entry-id: 109 dn: cn=restart, cn=Operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb0b-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1578,10 +1579,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb0b-1dd211b2-8008e98c-0e470000 -# entry-id: 113 +# entry-id: 110 dn: cn=Backup, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb0c-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1592,10 +1593,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb0c-1dd211b2-8008e98c-0e470000 -# entry-id: 114 +# entry-id: 111 dn: cn=Restore, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb0d-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1606,10 +1607,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb0d-1dd211b2-8008e98c-0e470000 -# entry-id: 115 +# entry-id: 112 dn: cn=KeyCert, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb0e-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1619,10 +1620,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb0e-1dd211b2-8008e98c-0e470000 -# entry-id: 116 +# entry-id: 113 dn: cn=Authenticate, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb0f-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1632,10 +1633,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb0f-1dd211b2-8008e98c-0e470000 -# entry-id: 117 +# entry-id: 114 dn: cn=CompleteImport, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb10-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1645,10 +1646,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb10-1dd211b2-8008e98c-0e470000 -# entry-id: 118 +# entry-id: 115 dn: cn=CompleteExport, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb11-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1658,10 +1659,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb11-1dd211b2-8008e98c-0e470000 -# entry-id: 119 +# entry-id: 116 dn: cn=Export, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb12-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1671,10 +1672,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb12-1dd211b2-8008e98c-0e470000 -# entry-id: 120 +# entry-id: 117 dn: cn=Import, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb13-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1684,10 +1685,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb13-1dd211b2-8008e98c-0e470000 -# entry-id: 121 +# entry-id: 118 dn: cn=ViewLog, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb14-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1697,10 +1698,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb14-1dd211b2-8008e98c-0e470000 -# entry-id: 122 +# entry-id: 119 dn: cn=ListBackups, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb15-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1710,10 +1711,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb15-1dd211b2-8008e98c-0e470000 -# entry-id: 123 +# entry-id: 120 dn: cn=Remove, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb16-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1723,10 +1724,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb16-1dd211b2-8008e98c-0e470000 -# entry-id: 124 +# entry-id: 121 dn: cn=CreateVLVIndex, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb17-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1736,10 +1737,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb17-1dd211b2-8008e98c-0e470000 -# entry-id: 125 +# entry-id: 122 dn: cn=AddIndex, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb18-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1749,10 +1750,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb18-1dd211b2-8008e98c-0e470000 -# entry-id: 126 +# entry-id: 123 dn: cn=SNMPCtrl, cn=operation, cn=Tasks, cn=slapd-localhost2, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb19-1dd211b2-8008e98c-0e470000 objectClass: top objectClass: nstask objectClass: nsAdminObject @@ -1762,85 +1763,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307172952Z modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb19-1dd211b2-8008e98c-0e470000 # entry-id: 127 -dn: cn=Tasks, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot -objectClass: top -objectClass: nsResourceRef -cn: Tasks -creatorsName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot -modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot -createTimestamp: 20070307172952Z -modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb1a-1dd211b2-8008e98c-0e470000 - -# entry-id: 128 -dn: cn=Operation, cn=Tasks, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot -objectClass: top -objectClass: nstaskgroup -nsTaskLabel: Operation Tasks Group -cn: Operation -creatorsName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot -modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot -createTimestamp: 20070307172952Z -modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb1b-1dd211b2-8008e98c-0e470000 - -# entry-id: 129 -dn: cn=Migrate, cn=Operation, cn=Tasks, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot -objectClass: top -objectClass: nstask -objectClass: nsAdminObject -nsExecRef: perl?migrateInstance -cn: Migrate -creatorsName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot -modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot -createTimestamp: 20070307172952Z -modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb1c-1dd211b2-8008e98c-0e470000 - -# entry-id: 130 -dn: cn=Create, cn=Operation, cn=Tasks, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot -objectClass: top -objectClass: nstask -objectClass: nsAdminObject -nsExecRef: ds_create -cn: Create -creatorsName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot -modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot -createTimestamp: 20070307172952Z -modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb1d-1dd211b2-8008e98c-0e470000 - -# entry-id: 131 -dn: cn=GetConfigInfo, cn=Operation, cn=Tasks, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot -objectClass: top -objectClass: nstask -objectClass: nsAdminObject -nsExecRef: perl?getConfigInfo -cn: GetConfigInfo -creatorsName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot -modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot -createTimestamp: 20070307172953Z -modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb1e-1dd211b2-8008e98c-0e470000 - -# entry-id: 132 -dn: cn=MigrateLocalDB, cn=Operation, cn=Tasks, cn=Fedora Directory Server, cn=Server Group, cn=localhost.localdomain, ou=localdomain, o=NetscapeRoot -objectClass: top -objectClass: nstask -objectClass: nsAdminObject -nsExecRef: perl?migrateLocalDB -cn: MigrateLocalDB -creatorsName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot -modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot -createTimestamp: 20070307172953Z -modifyTimestamp: 20070307174048Z -nsUniqueId: 73c3bb1f-1dd211b2-8008e98c-0e470000 - -# entry-id: 133 dn: cn=DS_MISCELLANEOUS,ou=4.0,ou=Console,ou="uid=admin, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot",ou=UserPreferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb20-1dd211b2-8008e98c-0e470000 cn: DS_MISCELLANEOUS objectClass: top objectClass: nsAdminConsoleUser @@ -1848,10 +1774,10 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307173028Z modifyTimestamp: 20070307173028Z -nsUniqueId: 73c3bb20-1dd211b2-8008e98c-0e470000 -# entry-id: 134 +# entry-id: 128 dn: cn=TaskTab,ou=4.0,ou=Console,ou="uid=admin, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot",ou=UserPreferences, ou=localdomain, o=NetscapeRoot +nsUniqueId: 73c3bb21-1dd211b2-8008e98c-0e470000 cn: TaskTab objectClass: top objectClass: nsAdminConsoleUser @@ -1859,5 +1785,4 @@ modifiersName: uid=admin,ou=administrators,ou=topologymanagement,o=netscaperoot createTimestamp: 20070307173030Z modifyTimestamp: 20070307173030Z -nsUniqueId: 73c3bb21-1dd211b2-8008e98c-0e470000 Index: psetread.c =================================================================== RCS file: /cvs/dirsec/adminutil/tests/psetread.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- psetread.c 4 Apr 2007 19:37:47 -0000 1.1 +++ psetread.c 8 May 2007 19:13:26 -0000 1.2 @@ -29,16 +29,42 @@ #include "libadminutil/admutil.h" #include "libadminutil/srvutil.h" +static void +dump_pset_node(PsetHndl pset, char *nodeName) +{ + char buf[BUFSIZ]; + int rval = 0; + AttributeList iter; + AttributePtr attrPtr = NULL; + AttributeList nodeAttrs = psetGetAllAttrsACI(pset, nodeName, &rval); + + fprintf(stderr, "pset operation returned [%d: %s]\n", rval, psetErrorString(rval, NULL, buf, sizeof(buf), NULL)); + if (!nodeAttrs) { + goto localdone; + } + + iter = nodeAttrs; + while (attrPtr = *iter++) { + char *p = NULL; + int ii = 0; + for (p = attrPtr->attrVal[0]; attrPtr->attrVal && attrPtr->attrVal[ii]; + p = attrPtr->attrVal[++ii]) { + fprintf(stderr, "%s: %s\n", attrPtr->attrName, attrPtr->attrVal[ii]); + } + } + +localdone: + deleteAttributeList(nodeAttrs); + + return; +} + main(int ac, char **av) { int _ai=ADMUTIL_Init(); PsetHndl pset = NULL; char *configdir = NULL; int rval = 0; - AttributeList nodeAttrs = NULL; - AttributeList iter = NULL; - char *nodeName = NULL; - AttributePtr attrPtr = NULL; char buf[BUFSIZ]; if (ac > 1) { @@ -55,53 +81,25 @@ pset = psetCreate("slapd-localhost", configdir, NULL, NULL, &rval); fprintf(stderr, "pset operation returned [%d: %s]\n", rval, psetErrorString(rval, NULL, buf, sizeof(buf), NULL)); - if (!pset || rval) { + if (!pset || (rval && (rval != PSET_LOCAL_OPEN_FAIL))) { /* no local file for slapd - OK */ goto done; } - nodeName = PL_strdup(""); + dump_pset_node(pset, ""); + dump_pset_node(pset, "configuration"); - nodeAttrs = psetGetAllAttrsACI(pset, nodeName, &rval); - fprintf(stderr, "pset operation returned [%d: %s]\n", rval, psetErrorString(rval, NULL, buf, sizeof(buf), NULL)); - if (!nodeAttrs) { - goto done; - } - - iter = nodeAttrs; - while (attrPtr = *iter++) { - char *p = NULL; - int ii = 0; - for (p = attrPtr->attrVal[0]; attrPtr->attrVal && attrPtr->attrVal[ii]; - p = attrPtr->attrVal[++ii]) { - fprintf(stderr, "%s: %s\n", attrPtr->attrName, attrPtr->attrVal[ii]); - } - } - deleteAttributeList(nodeAttrs); - nodeAttrs = NULL; - - PL_strfree(nodeName); - nodeName = PL_strdup("configuration"); - - nodeAttrs = psetGetAllAttrsACI(pset, nodeName, &rval); + psetDelete(pset); + pset = psetCreate(NULL, configdir, NULL, NULL, &rval); /* admin-serv */ fprintf(stderr, "pset operation returned [%d: %s]\n", rval, psetErrorString(rval, NULL, buf, sizeof(buf), NULL)); - if (!nodeAttrs) { + if (!pset || (rval && (rval != PSET_LOCAL_OPEN_FAIL))) { /* no local file for slapd - OK */ goto done; } - iter = nodeAttrs; - while (attrPtr = *iter++) { - char *p = NULL; - int ii = 0; - for (p = attrPtr->attrVal[0]; attrPtr->attrVal && attrPtr->attrVal[ii]; - p = attrPtr->attrVal[++ii]) { - fprintf(stderr, "%s: %s\n", attrPtr->attrName, attrPtr->attrVal[ii]); - } - } + dump_pset_node(pset, ""); + dump_pset_node(pset, "configuration"); done: - deleteAttributeList(nodeAttrs); psetDelete(pset); free(configdir); - PL_strfree(nodeName); exit(rval); } Index: psetreadssl.c =================================================================== RCS file: /cvs/dirsec/adminutil/tests/psetreadssl.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- psetreadssl.c 4 Apr 2007 19:37:47 -0000 1.1 +++ psetreadssl.c 8 May 2007 19:13:26 -0000 1.2 @@ -29,6 +29,7 @@ #include "libadminutil/admutil.h" #include "libadminutil/srvutil.h" #include "libadmsslutil/psetcssl.h" +#include "libadmsslutil/admsslutil.h" main(int ac, char **av) { @@ -67,7 +68,7 @@ fprintf(stdout, "%s: securitydir: %s\n", *av, securitydir); } - rval = ADMSSL_InitSimple(configdir, securitydir); + rval = ADMSSL_InitSimple(configdir, securitydir, 0); if (rval) { fprintf(stderr, "ADMSSL_InitSimple(%s,%s) failed: %d\n", configdir, securitydir, rval); goto done; Index: psetwrite.c =================================================================== RCS file: /cvs/dirsec/adminutil/tests/psetwrite.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- psetwrite.c 4 Apr 2007 19:37:47 -0000 1.1 +++ psetwrite.c 8 May 2007 19:13:26 -0000 1.2 @@ -30,16 +30,43 @@ #include "libadminutil/admutil.h" #include "libadminutil/srvutil.h" +static void +dump_pset_node(PsetHndl pset, char *nodeName) +{ + char buf[BUFSIZ]; + int rval = 0; + AttributeList iter; + AttributePtr attrPtr = NULL; + AttributeList nodeAttrs = psetGetAllAttrsACI(pset, nodeName, &rval); + + fprintf(stderr, "pset operation returned [%d: %s]\n", rval, psetErrorString(rval, NULL, buf, sizeof(buf), NULL)); + if (!nodeAttrs) { + goto localdone; + } + + iter = nodeAttrs; + while (attrPtr = *iter++) { + char *p = NULL; + int ii = 0; + for (p = attrPtr->attrVal[0]; attrPtr->attrVal && attrPtr->attrVal[ii]; + p = attrPtr->attrVal[++ii]) { + fprintf(stderr, "%s: %s\n", attrPtr->attrName, attrPtr->attrVal[ii]); + } + } + +localdone: + deleteAttributeList(nodeAttrs); + + return; +} + +int main(int ac, char **av) { int _ai=ADMUTIL_Init(); PsetHndl pset = NULL; char *configdir = NULL; int rval = 0; - AttributeList nodeAttrs = NULL; - AttributeList iter = NULL; - char *nodeName = NULL; - AttributePtr attrPtr = NULL; AttributeList updateList = NULL, addList = NULL; char *attrs[] = { "configuration.nsAdminCacheLifetime", @@ -74,31 +101,13 @@ fprintf(stdout, "%s: configdir: %s\n", *av, configdir); } - pset = psetCreate("slapd-localhost", configdir, NULL, NULL, &rval); + pset = psetCreate(NULL, configdir, NULL, NULL, &rval); fprintf(stderr, "pset operation returned [%d: %s]\n", rval, psetErrorString(rval, NULL, buf, sizeof(buf), NULL)); if (!pset || rval) { goto done; } - nodeName = PL_strdup("configuration"); - - nodeAttrs = psetGetAllAttrsACI(pset, nodeName, &rval); - fprintf(stderr, "pset operation returned [%d: %s]\n", rval, psetErrorString(rval, NULL, buf, sizeof(buf), NULL)); - if (!nodeAttrs) { - goto done; - } - - iter = nodeAttrs; - while (attrPtr = *iter++) { - char *p = NULL; - int ii = 0; - for (p = attrPtr->attrVal[0]; attrPtr->attrVal && attrPtr->attrVal[ii]; - p = attrPtr->attrVal[++ii]) { - fprintf(stderr, "%s: %s\n", attrPtr->attrName, attrPtr->attrVal[ii]); - } - } - deleteAttributeList(nodeAttrs); - nodeAttrs = NULL; + dump_pset_node(pset, "configuration"); updateList = createAttributeList(nattrs); while (ii < nattrs) { @@ -115,7 +124,7 @@ deleteAttributeList(updateList); updateList = NULL; - nodeObjectClass = psetGetObjectClass(pset, nodeName, &rval); + nodeObjectClass = psetGetObjectClass(pset, "configuration", &rval); if (rval) { psetDelete(pset); fprintf(stderr, "PSET_ERROR_NUMBER: %d\nPSET_ERROR_INFO: %s\n", @@ -144,11 +153,15 @@ goto done; } + fprintf(stderr, "After adding objectclass extensibleObject: \n"); + dump_pset_node(pset, "configuration"); + ii = 0; while (ii < nnewattrs) { rval = psetAddSingleValueAttribute(pset, newattrs[ii], "new value"); if (rval) { - fprintf(stderr, "PSET_ERROR_NUMBER: %d\nPSET_ERROR_INFO: %s\n", + fprintf(stderr, "Could not add attribute [%s]: PSET_ERROR_NUMBER: %d\nPSET_ERROR_INFO: %s\n", + newattrs[ii], rval, psetErrorString(rval, NULL, buf, sizeof(buf), NULL)); goto done; @@ -156,28 +169,13 @@ ++ii; } - nodeAttrs = psetGetAllAttrsACI(pset, nodeName, &rval); - fprintf(stderr, "pset operation returned [%d: %s]\n", rval, psetErrorString(rval, NULL, buf, sizeof(buf), NULL)); - if (!nodeAttrs) { - goto done; - } - - iter = nodeAttrs; - while (attrPtr = *iter++) { - char *p = NULL; - int ii = 0; - for (p = attrPtr->attrVal[0]; attrPtr->attrVal && attrPtr->attrVal[ii]; - p = attrPtr->attrVal[++ii]) { - fprintf(stderr, "%s: %s\n", attrPtr->attrName, attrPtr->attrVal[ii]); - } - } + fprintf(stderr, "After adding bogus attributes\n"); + dump_pset_node(pset, "configuration"); done: free(configdir); psetDelete(pset); - PL_strfree(nodeName); deleteValue(nodeObjectClass); - deleteAttributeList(nodeAttrs); deleteAttributeList(updateList); deleteAttrNameList(ocList); exit(rval); Index: retrieveSIEssl.c =================================================================== RCS file: /cvs/dirsec/adminutil/tests/retrieveSIEssl.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- retrieveSIEssl.c 4 Apr 2007 19:37:47 -0000 1.1 +++ retrieveSIEssl.c 8 May 2007 19:13:26 -0000 1.2 @@ -71,7 +71,7 @@ fprintf(stdout, "%s: securitydir: %s\n", *av, securitydir); } - rval = ADMSSL_InitSimple(configdir, securitydir); + rval = ADMSSL_InitSimple(configdir, securitydir, 0); if (rval) { fprintf(stderr, "ADMSSL_InitSimple(%s,%s) failed: %d\n", configdir, securitydir, rval); exit(1);

15 years, 10 months

1
0
0 / 0

[Fedora-directory-commits] adminutil/lib/libadmsslutil admsslutil.c, 1.7, 1.8 psetcssl.c, 1.3, 1.4 srvutilssl.c, 1.4, 1.5

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminutil/lib/libadmsslutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19482/adminutil/lib/libadmsslutil Modified Files: admsslutil.c psetcssl.c srvutilssl.c Log Message: Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use 5) small memory error in the new code in resource.c - does not affect any released code. Make sure the buffer is correctly null terminated. Also, clean up a small memory leak. 6) small memory leaks in various places in uginfo.c - also changed some code to use PR_smprintf instead of fixed size buffers. Fixed memory leaks. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: admsslutil.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/admsslutil.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- admsslutil.c 4 Apr 2007 19:37:47 -0000 1.7 +++ admsslutil.c 8 May 2007 19:13:26 -0000 1.8 @@ -168,7 +168,7 @@ /*minPwdLen=*/8, /*pwdRequired=*/1); /* init NSS */ - if (NSS_Initialize(securitydir, NULL, NULL, "secmod.db", flags)) { + if (NSS_Initialize(securitydir, NULL, NULL, SECMOD_DB, flags)) { return -1; } @@ -198,16 +198,16 @@ PR_IMPLEMENT(int) -ADMSSL_InitSimple(char* configdir, char *securitydir) +ADMSSL_InitSimple(char* configdir, char *securitydir, int force) { AdmldapInfo admLdapInfo=NULL; int error; admLdapInfo = admldapBuildInfo(configdir, &error); - if (!admLdapInfo) return -1; + if (!admLdapInfo && !force) return -1; - if (admldapGetSecurity(admLdapInfo)) { - error = ADMSSL_Init(admLdapInfo, securitydir); + if (force || admldapGetSecurity(admLdapInfo)) { + error = ADMSSL_Init(admLdapInfo, securitydir, force); } else { error = 0; } @@ -218,14 +218,18 @@ /* set minimum SSL stuff for LDAP/SSL to work */ PR_IMPLEMENT(int) -ADMSSL_Init(AdmldapInfo info, char *securitydir) +ADMSSL_Init(AdmldapInfo info, char *securitydir, int force) { - int secure; + int secure = 0; char *dirURL, *bindDN, *bindPwd, *dirInfoRef; int errCode; int needfree = 0; - secure = admldapGetSecurity(info); + if (force) { + secure = 1; + } else { + secure = admldapGetSecurity(info); + } if (!secure) { admldapGetLocalUserDirectory(info, @@ -239,7 +243,7 @@ return 0; } - if (!securitydir) { + if (!securitydir && info) { securitydir = admldapGetSecurityDir(info); needfree = 1; } @@ -402,13 +406,11 @@ * Modify "security" in adm.conf and DS */ void set_security(PsetHndl pset, - char *securitydir, /* where security files can be found */ - char *configdir, /* where config files can be found */ + char *configdir, /* where config files can be found */ char *security /* security on/off */ ) { int rv; - AdmldapInfo admInfo = NULL; /* set security attribute in DS */ if((pset) && (security) && (*security != '\0')) { @@ -425,22 +427,6 @@ servssl_error("PSET attribute modification failed!"); } } - - /* add/edit security fields in adm.conf */ - rv = 0; - admInfo = admldapBuildInfoOnly(configdir, &rv); - if (!admInfo || rv) { - servssl_error("Can not open adm.conf for reading"); - } - - if (is_dir_ok(securitydir)) { - admldapSetSecurityDir(admInfo, securitydir); - } - - if (admldapWriteInfoFile(admInfo)) { - servssl_error("Can not open adm.conf for writing"); - } - destroyAdmldap(admInfo); } @@ -587,7 +573,7 @@ { PRFileDesc *ssl_socket = NULL; - if (ADMSSL_InitSimple((char *)configdir, (char *)securitydir) != 0) { + if (ADMSSL_InitSimple((char *)configdir, (char *)securitydir, 0) != 0) { PR_Close(ssl_socket); return NULL; } Index: psetcssl.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/psetcssl.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- psetcssl.c 4 Apr 2007 19:37:47 -0000 1.3 +++ psetcssl.c 8 May 2007 19:13:26 -0000 1.4 @@ -27,6 +27,7 @@ #include "ldap_ssl.h" #include "libadminutil/distadm.h" #include "libadmsslutil/psetcssl.h" +#include "libadmsslutil/srvutilssl.h" #ifdef XP_WIN32 #define strcasecmp stricmp @@ -153,11 +154,12 @@ psetCreateSSL(char* serverID, char* configRoot, char* user, char* passwd, int* errorcode) { - PsetHndl pset; + PsetHndl pset = NULL; AdmldapInfo ldapInfo= NULL; - char *path = NULL, *ldapHost=NULL, *sieDN, *bindPasswd = NULL; + char *path = NULL, *ldapHost=NULL, *sieDN = NULL, *bindPasswd = NULL; char *userDN = NULL; int ldapPort = -1, secure = 0; + int useLocalConf = 1; ldapInfo = admldapBuildInfo(configRoot, errorcode); @@ -178,8 +180,21 @@ if (ldapPort < 0) ldapPort = 389; } - /* Get SIE and password */ - sieDN = admldapGetSIEDN(ldapInfo); + /* Get SIE */ + /* if server is admin-serv, then the ldapInfo sieDN is the correct sieDN */ + if (!serverID || !PL_strncasecmp(serverID, "admin-serv", strlen("admin-serv"))) { + sieDN = admldapGetSIEDN(ldapInfo); + } else { /* given other serverID */ + sieDN = findSIEDNByIDSSL(ldapInfo, serverID); + if (!sieDN) { + *errorcode = PSET_ENTRY_NOT_EXIST; + goto done; + } + useLocalConf = 0; /* disallow local.conf creation - will overwrite admin server one */ + /* use psetRealCreateSSL to pass in a conf file */ + } + + /* get user dn and password */ if (!user) { ADM_GetUserDNString(errorcode, &user); } @@ -199,13 +214,15 @@ } /* find local.conf file */ - if (!(path = find_file_in_paths("local.conf", configRoot))) { + if (useLocalConf && + !(path = find_file_in_paths("local.conf", configRoot))) { /* error - no valid file or dir could be found */ *errorcode = PSET_ENV_ERR; } pset = psetRealCreateSSL(ldapHost, ldapPort, secure, sieDN, userDN, bindPasswd, path, errorcode); +done: destroyAdmldap(ldapInfo); PR_Free(userDN); PR_Free(ldapHost); Index: srvutilssl.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/srvutilssl.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- srvutilssl.c 4 Apr 2007 19:37:47 -0000 1.4 +++ srvutilssl.c 8 May 2007 19:13:26 -0000 1.5 @@ -145,3 +145,35 @@ } +#define IS_A_DELIMITER(x) ((x == ',') || (x == ' ') || (x == '+') || (x == '\0')) + +PR_IMPLEMENT(char *) +findSIEDNByIDSSL(AdmldapInfo info, const char *serverID) +{ + char *retval = NULL; + AttrNameList nl = getServerDNListSSL(info); + + if (nl) { + size_t len = strlen(serverID); + AttrNameList nlptr = nl; + while (retval = *nlptr++) { + /* nl is a list of DNs like this: + cn=slapd-foo, ... + cn=slapd-bar,... + cn=admin-serv-localhost, + ... + serverID is the value of the cn - we have to look for the trailing + delimiter to distinguish between slapd-foo slapd-foo2 + */ + if ((len <= strlen(retval+3)) && + !PL_strncasecmp(retval+3, serverID, len) && + (IS_A_DELIMITER(retval[3+len]))) { + retval = PL_strdup(retval); + break; + } + } + deleteAttrNameList(nl); + } + + return retval; +}

15 years, 10 months

1
0
0 / 0

[Fedora-directory-commits] adminutil/include/libadminutil srvutil.h, 1.3, 1.4

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminutil/include/libadminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19482/adminutil/include/libadminutil Modified Files: srvutil.h Log Message: Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use 5) small memory error in the new code in resource.c - does not affect any released code. Make sure the buffer is correctly null terminated. Also, clean up a small memory leak. 6) small memory leaks in various places in uginfo.c - also changed some code to use PR_smprintf instead of fixed size buffers. Fixed memory leaks. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: srvutil.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/srvutil.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- srvutil.h 6 Dec 2005 18:38:31 -0000 1.3 +++ srvutil.h 8 May 2007 19:13:25 -0000 1.4 @@ -44,6 +44,10 @@ PR_IMPLEMENT(AttributeList) getInstalledServerDNList(AdmldapInfo info); +/* return the SIE DN for the given server */ +PR_IMPLEMENT(char *) +findSIEDNByID(AdmldapInfo info, const char *serverID); + #ifdef __cplusplus } #endif

15 years, 10 months

1
0
0 / 0

[Fedora-directory-commits] adminutil/include/libadmsslutil admsslutil.h, 1.3, 1.4 srvutilssl.h, 1.2, 1.3

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminutil/include/libadmsslutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19482/adminutil/include/libadmsslutil Modified Files: admsslutil.h srvutilssl.h Log Message: Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use Resolves: bug 239475 Bug Description: adminutil: Several admin server related bugs Reviewed by: nhosoi (Thanks!) Fix Description: 1) I needed a function to return the SIE DN given a server ID (e.g. return cn=slapd-localhost, cn=..... given slapd-localhost). This is to avoid lots of duplicate code in the admin server CGIs. There is an SSL version as well. Create non-ssl and ssl function to find the SIE DN given the SIE ID. Change pset code to use these new functions 2) Need to be able to force NSS initialization via ADMSSL_Init*. There were a couple of places where admin server would perform a SHA hash using homegrown code. This has been removed in favor of using NSS. ADMSSL_Init* would fail if not configured for SSL, so we need to force it to initialize NSS even if SSL is not configured. Change the ADMSSL_Init* routines to accept a force parameter. If this parameter is true, force NSS_Initialize even if the adminutil is not configured for SSL. Changed code that uses ADMSSL_Init* to use this new parameter.3) PSET attribute removal is just broken. It corrupts the internal tree structure used to hold the attr/values. The pset node removal code needed to set the node->left or ->right to NULL only after freeing it. Fortunately this function is hardly used at all. 4) small memory leak in form_post.c - not a big deal as this is only used by CGIs which usually don't free() anyway but just exit() to release their memory. free memory after use 5) small memory error in the new code in resource.c - does not affect any released code. Make sure the buffer is correctly null terminated. Also, clean up a small memory leak. 6) small memory leaks in various places in uginfo.c - also changed some code to use PR_smprintf instead of fixed size buffers. Fixed memory leaks. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: admsslutil.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/admsslutil.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- admsslutil.h 4 Apr 2007 19:37:46 -0000 1.3 +++ admsslutil.h 8 May 2007 19:13:25 -0000 1.4 @@ -55,13 +55,13 @@ int* error_code); -void MC_sslSecmodInit(char *path); - +/* force means init NSS even if SSL is not being used - for hashing, etc. */ PR_IMPLEMENT(int) -ADMSSL_Init(AdmldapInfo info, char *securitydir); +ADMSSL_Init(AdmldapInfo info, char *securitydir, int force); +/* force means init NSS even if SSL is not being used - for hashing, etc. */ PR_IMPLEMENT(int) -ADMSSL_InitSimple(char *configdir, char *securitydir); +ADMSSL_InitSimple(char *configdir, char *securitydir, int force); char *ADM_GetPassword(char *prompt); @@ -70,7 +70,6 @@ #endif void set_security(PsetHndl pset, - char *securitydir, /* where security files (key/cert db) may be found */ char *configdir, /* where config files may be found */ char *security); /* on or off */ Index: srvutilssl.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadmsslutil/srvutilssl.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- srvutilssl.h 6 Dec 2005 18:38:37 -0000 1.2 +++ srvutilssl.h 8 May 2007 19:13:25 -0000 1.3 @@ -38,6 +38,10 @@ PR_IMPLEMENT(AttributeList) getInstalledServerDNListSSL(AdmldapInfo info); +/* return the SIE DN for the given server */ +PR_IMPLEMENT(char *) +findSIEDNByIDSSL(AdmldapInfo info, const char *serverID); + #ifdef __cplusplus } #endif

15 years, 10 months

1
0
0 / 0

[Fedora-directory-commits] adminserver/m4 - New directory

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver/m4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19150/m4 Log Message: Directory /cvs/dirsec/adminserver/m4 added to the repository

15 years, 10 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits May 2007