[Fedora-directory-devel] Please review: Bug 454030 - Need to address 64-bit compiler warnings - again
by Rich Megginson
https://bugzilla.redhat.com/show_bug.cgi?id=454030
Resolves: bug 454030
Bug Description: Need to address 64-bit compiler warnings - again
Reviewed by: ???
Files: see diff
Branch: HEAD
Fix Description: This patch cleans up most of the other remaining
compiler warnings. I compiled the directory server code with these
flags on RHEL5 x86_64: -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2
-fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
I also enabled argument/format match checking for most of the commonly
used varadic functions. Most of the problems I found fell into these
categories:
1) Too many or not enough arguments e.g. most everything that uses or
did use LDAPDebug had extra 0,0 arguments. If they had been switched to
use slapi_log_error, I removed the extra arguments - for those places
still using LDAPDebug, I introduced more macros to handle the number of
arguments, since C macros cannot be varadic.
2) When using NSPR formatting functions, we have to use %llu or %lld for
64-bit values, even on 64-bit systems. However, for regular system
formatting functions, we have to use %ld or %lu. I introduced two new
macros NSPRIu64 and NSPRI64 to handle cases where we are passing
explicit 64-bit values to NSPR formatting functions, so that we can use
the regular PRIu64 and PRI64 macros for regular system formatting
functions. I also made sure we used NSPRI* only with NSPR functions,
and used PRI* only with system functions.
3) use %lu for size_t and %ld for time_t
I did find a few "real" errors, places that the code was doing something
definitely not right:
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
This is why it's important to use this compiler checking, and why it's
important to fix compiler warnings, if for no other reason than the
sheer noise from so many warnings can mask real errors.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff
15 years, 4 months
[Fedora-directory-devel] Please review: Clean up adminserver code
by Rich Megginson
Reviewed by: ???
Files: see diff
Branch: HEAD
Fix Description: Fix various compiler warnings about define
redefinitions, unused functions/variables, wrong types being cast, etc.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: mod_admserv/mod_admserv.c
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v
retrieving revision 1.34
diff -u -8 -r1.34 mod_admserv.c
--- mod_admserv/mod_admserv.c 3 Sep 2008 17:32:51 -0000 1.34
+++ mod_admserv/mod_admserv.c 4 Dec 2008 17:40:14 -0000
@@ -20,17 +20,35 @@
* Rob Crittenden
* Miodrag Kekic
* Rich Megginson
* Adam Prishtina
*
*/
#include <unistd.h>
+/* httpd.h defines
+ all of these unconditionally - so we undefine
+ them here to make the compiler warnings shut up
+ hopefully we don't need the real versions
+ of these, but then with no warnings the compiler
+ will just silently redefine them to the wrong
+ ones anyway
+ Then undefine them after the include so that
+ our own local defines will take effect
+*/
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
#include "httpd.h"
+#define CORE_PRIVATE 1 /* to pick up ap_die */
+#include "http_request.h"
+#undef CORE_PRIVATE
#include "apr_strings.h"
#include "apr_lib.h"
#include "apr_optional.h"
#include "apr_fnmatch.h"
#define APR_WANT_STRFUNC
#include "apr_want.h"
@@ -38,18 +56,22 @@
#include "ap_mpm.h"
#include "apr_sha1.h"
#include "mod_log_config.h"
#include "httpd.h"
#include "http_core.h"
#include "http_config.h"
#include "http_connection.h"
#include "http_protocol.h"
-#include "http_request.h"
#include "http_log.h"
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
/* need uid and gid of apache process after setuid */
#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
#include "unixd.h"
#define CHANGE_EUID 1
#endif
#include "libadminutil/distadm.h"
@@ -538,17 +560,17 @@
if (user) data->user = apr_pstrdup(module_pool, user);
if (pw) data->pw = apr_pstrdup(module_pool, pw);
ldap_set_rebind_proc(server, admserv_ldap_rebind_proc, (void *)data);
}
static apr_status_t close_pipe(void *thefd)
{
- int fd = (int)thefd;
+ int fd = (int)((intptr_t)thefd);
return close(fd);
}
static int password_pipe(request_rec *r)
{
apr_table_t *e = r->subprocess_env;
int fd;
@@ -592,17 +614,17 @@
return HTTP_INTERNAL_SERVER_ERROR;
}
/* Get the low-level file descriptor */
apr_os_file_get(&fd, readp);
/* Register a cleanup callback so this gets closed at the end of the
request. */
- apr_pool_cleanup_register(r->pool, (void *)fd, close_pipe,
+ apr_pool_cleanup_register(r->pool, (void *)((intptr_t)fd), close_pipe,
apr_pool_cleanup_null);
/* Send this to the client so they know what fd to read from */
apr_table_setn(e, "PASSWORD_PIPE", apr_itoa(r->pool, fd));
nbytes = strlen(ans);
apr_file_write(writep, ans, &nbytes);
@@ -781,17 +803,16 @@
return 1;
}
static int
buildUGInfo(char** errorInfo, const request_rec *r) {
AdmldapInfo info = NULL;
server_rec *s = r->server;
int error = 0;
- char path[PATH_MAX];
char *userGroupLdapURL = NULL;
char *userGroupBindDN = NULL;
char *userGroupBindPW = NULL;
char *dirInfoRef = NULL;
int retval = FALSE;
char *siedn = NULL;
*errorInfo = (char*)"";
@@ -1187,17 +1208,16 @@
PL_strfree(siedn);
destroyAdmldap(ldapInfo);
return TRUE;
}
static int update_admpwd(char *admroot, char *newuid, char *newpw);
-static int update_adm_conf(char *admroot, char *newpw);
/*
* Miodrag (06-15-98)
* The following metthod is called from the runtime command
* "change_sie_password" after the sie password is changed
*
* Return value: if successful, 1; otherwise, 0 is returned.
*/
@@ -1208,17 +1228,16 @@
LDAP *ld;
AdmldapInfo ldapInfo;
int ldapError;
char *ldapURL = NULL;
const char *userDN = NULL;
char *adminDN = NULL;
LDAPMod mod, *mods[2];
char *vals[2];
- char *attrs[2];
int rval = 0;
int error;
/* We need ldapInfo to fetch the adminDN */
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
"task_update_registry_server_bindpw: getting ldap info for [%s]",
configdir);
ldapInfo = admldapBuildInfo(configdir, &error);
@@ -1313,17 +1332,17 @@
/*
* Modify SIE password
*/
static int
change_sie_password(const char *name, char *query, void* arg, request_rec *r)
{
FILE *f;
- char *uid=NULL ,*pw=NULL, *col=NULL, *origpw_hash=NULL;
+ char *uid=NULL , *col=NULL, *origpw_hash=NULL;
char *newpw=query;
char filename[BIG_LINE];
char inbuf[BIG_LINE];
char outbuf[64]; /* needs at least 36 bytes */
char *bindpw = (char *)apr_table_get(r->notes, RQ_NOTES_USERPW);
int admpwd_done = 0;
apr_snprintf(filename, sizeof(filename), "%s/admpw", configdir);
@@ -2210,20 +2229,18 @@
}
static int
do_admserv_post_config(apr_pool_t *p, apr_pool_t *plog,
apr_pool_t *ptemp,
server_rec *base_server)
{
AdmldapInfo info;
- char path[PATH_MAX];
int error;
LDAP *server;
- char *errorInfo = NULL;
int tries = 0;
admserv_serv_config *srv_cfg = NULL;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, base_server,
"Entering do_admserv_post_config - pid is [%d]",
getpid());
/* if configdir was not set in the config, get from the environment */
@@ -2442,29 +2459,29 @@
* Create the per-directory structure.
*/
static void * create_config(apr_pool_t *p, char *path)
{
admserv_config * cf = (admserv_config *) apr_palloc(p, sizeof(admserv_config));
cf->nescompat = 0;
cf->adminsdk = 0;
cf->cgibindir = 0;
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, "[%d] create_config [0x%x] for %s",
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, "[%d] create_config [0x%p] for %s",
getpid(), cf, path ? path : "(null)");
return (void *) cf;
}
/*
* Create the per-server structure.
*/
static void * create_server_config(apr_pool_t *p, server_rec *s)
{
admserv_serv_config * cf = (admserv_serv_config *) apr_pcalloc(p, sizeof(admserv_serv_config));
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, "[%d] create_server_config [0x%x] for %s",
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, "[%d] create_server_config [0x%p] for %s",
getpid(), cf, s->server_hostname ? s->server_hostname : "(null)");
cf->gconfig = admserv_config_global_create(s);
return (void *) cf;
}
static const char * adminsdk(cmd_parms *cmd, void *dconf, int flag)
{
@@ -2514,17 +2531,17 @@
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, "The %s config param cannot be specified in a Directory section",
cmd->directive->directive);
} else {
void *sconf = cmd->server->module_config;
admserv_serv_config *cf = (admserv_serv_config *)ap_get_module_config(sconf, &admserv_module);
cf->cacheLifeTime = atol(value);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
- "[%d] Set [0x%x] [%s] to %ld",
+ "[%d] Set [0x%p] [%s] to %ld",
getpid(), cf, cmd->directive->directive, cf->cacheLifeTime);
}
return NULL;
}
static const char * set_version_string(cmd_parms *cmd, void *dconf, const char *value)
{
@@ -2532,17 +2549,17 @@
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, "The %s config param cannot be specified in a Directory section",
cmd->directive->directive);
} else {
void *sconf = cmd->server->module_config;
admserv_serv_config *cf = (admserv_serv_config *)ap_get_module_config(sconf, &admserv_module);
cf->versionString = apr_pstrdup(cmd->pool, value);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
- "[%d] Set [0x%x] [%s] to %s",
+ "[%d] Set [0x%p] [%s] to %s",
getpid(), cf, cmd->directive->directive, cf->versionString);
}
return NULL;
}
static int userauth(request_rec *r)
{
Index: adminserver/admserv/cgi-src40/admpw.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/admpw.c,v
retrieving revision 1.9
diff -u -8 -r1.9 admpw.c
--- adminserver/admserv/cgi-src40/admpw.c 11 May 2007 19:44:05 -0000 1.9
+++ adminserver/admserv/cgi-src40/admpw.c 4 Dec 2008 17:37:14 -0000
@@ -28,16 +28,21 @@
*
* Set Operation
* in:op=set&admpw.uid=<newuid>&admpw.pw=<new password>
* If admpw.uid is found in cgi parameters, update uid in the config/admpw file
* If admpw.pw is found in cgi parameters, update password in:
* 1) "userPassword" attribute in the SIE on the DS
* 2) config/admpw file. The password is stored in encrypted form
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <prtypes.h>
#include <stdio.h>
#include <stdarg.h> /* for vsprintf */
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
/* NSS - for password hashing */
@@ -53,18 +58,16 @@
#include "libadminutil/resource.h"
#include "libadminutil/admutil.h"
#include "libadminutil/distadm.h"
#include "libadmsslutil/psetcssl.h"
#include "libadmsslutil/admsslutil.h"
#include "libadmin/libadmin.h"
-#include "config.h"
-
static void output_admuid(AdmldapInfo admInfo);
static void update_uidpwd();
static void update_admpwd(char *newuid, char *newpw, const char *filename);
static void update_ds(char *newpw);
static char *
sha1_pw_enc(const char *pwd)
{
@@ -147,21 +150,16 @@
static void i18nInit() {
i18nResource = res_find_and_init_resource(PROPERTYDIR, RESOURCE_FILE);
if (getenv("HTTP_ACCEPT_LANGUAGE")) {
acceptLanguage = getenv("HTTP_ACCEPT_LANGUAGE");
}
}
-static void i18nCleanup() {
- if (i18nResource != NULL) {
- res_destroy_resource(i18nResource);
- }
-}
static const char *i18nMsg(char *msgid, char *defaultMsg) {
const char *msg=NULL;
static char buf[BUFSIZ]; /* ok - not threaded code */
if (i18nResource) {
msg = res_getstring(i18nResource, msgid, acceptLanguage, buf, sizeof(buf), NULL);
}
if (msg == NULL) {
Index: adminserver/admserv/cgi-src40/config.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/config.c,v
retrieving revision 1.15
diff -u -8 -r1.15 config.c
--- adminserver/admserv/cgi-src40/config.c 14 Jul 2008 20:00:02 -0000 1.15
+++ adminserver/admserv/cgi-src40/config.c 4 Dec 2008 17:37:14 -0000
@@ -21,16 +21,22 @@
/*
* Description (config.c)
*
* This module contains routines used by administration CGI
* programs to set/get the attribute(s) of Admin server
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <prtypes.h>
+
#include <stdio.h>
#ifdef XP_UNIX
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <pwd.h>
#include <grp.h>
#include <dirent.h>
@@ -42,18 +48,16 @@
#include "libadminutil/distadm.h"
#include "libadminutil/admutil.h"
#include "libadmsslutil/psetcssl.h"
#include "libadmsslutil/admsslutil.h"
#include "libadmin/install.h"
#include "libadmin/libadmin.h"
-#include "config.h"
-
#ifdef XP_WIN32
#define EADDRINUSE WSAEADDRINUSE
#endif
static char msgbuf[BUFSIZ]; /* ok - not threaded code */
/*
properties file name = "config.properties"
Index: adminserver/admserv/cgi-src40/download.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/download.c,v
retrieving revision 1.8
diff -u -8 -r1.8 download.c
--- adminserver/admserv/cgi-src40/download.c 15 Nov 2007 17:02:02 -0000 1.8
+++ adminserver/admserv/cgi-src40/download.c 4 Dec 2008 17:37:14 -0000
@@ -91,17 +91,16 @@
exit(0);
}
int
main(int argc, char *argv[])
{
char line[PATH_LENGTH];
FILE *html;
- int i;
char *acceptLanguage = NULL;
char *loc;
acceptLanguage = getenv("HTTP_ACCEPT_LANGUAGE");
if (acceptLanguage == NULL)
{
acceptLanguage = "en";
}
@@ -163,9 +162,11 @@
}
continue;
}
printf("%s", line);
}
fflush(stdout);
fclose(html);
+
+ return 0;
}
Index: adminserver/admserv/cgi-src40/dsconfig.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/dsconfig.c,v
retrieving revision 1.9
diff -u -8 -r1.9 dsconfig.c
--- adminserver/admserv/cgi-src40/dsconfig.c 18 Jul 2007 22:10:22 -0000 1.9
+++ adminserver/admserv/cgi-src40/dsconfig.c 4 Dec 2008 17:37:14 -0000
@@ -124,21 +124,16 @@
static void i18nInit() {
i18nResource = res_find_and_init_resource(PROPERTYDIR, RESOURCE_FILE);
if (getenv("HTTP_ACCEPT_LANGUAGE")) {
acceptLanguage = getenv("HTTP_ACCEPT_LANGUAGE");
}
}
-static void i18nCleanup() {
- if (i18nResource != NULL) {
- res_destroy_resource(i18nResource);
- }
-}
static const char *i18nMsg(char *msgid, char *defaultMsg) {
const char *msg=NULL;
static char msgbuf[BUFSIZ]; /* ok - not threaded code */
if (i18nResource) {
msg = res_getstring(i18nResource, msgid, acceptLanguage, msgbuf, sizeof(msgbuf), NULL);
}
if (msg == NULL) {
Index: adminserver/admserv/cgi-src40/help.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/help.c,v
retrieving revision 1.11
diff -u -8 -r1.11 help.c
--- adminserver/admserv/cgi-src40/help.c 8 Aug 2007 23:36:04 -0000 1.11
+++ adminserver/admserv/cgi-src40/help.c 4 Dec 2008 17:37:14 -0000
@@ -491,17 +491,16 @@
help(char *name[], char *val[], int cnt)
{
char *product = NULL;
char *token = NULL;
char *content = NULL;
char *mapfile = NULL;
char path[PATH_LENGTH];
- FILE *frameset = NULL;
FILE *tokenfile = NULL;
int newstyle = 1;
if (!(product = find_arg(DIR_ARG, name, val, cnt)))
{
if (debugPrintout)
{
printf( "product argument not in URL<P>\n" );
@@ -625,17 +624,17 @@
}
fclose(tokenfile);
if (!content)
{
if (debugPrintout)
{
- printf( "Failed to translate the token: %\n<BR>\n", token?token:"" );
+ printf( "Failed to translate the token: %s\n<BR>\n", token?token:"" );
fflush( stdout );
}
return error_exit("unable to translate the token");
}
if (debugPrintout)
{
fflush( stdout );
@@ -791,17 +790,16 @@
return 0;
}
int
main(int argc, char *argv[])
{
char **name;
char **val;
- char *product;
int cnt;
if (!(localeList = getenv("HTTP_ACCEPT_LANGUAGE")))
/* default to en */
localeList = strdup("en");
cnt = parse_query_string(getenv("QUERY_STRING"), &name, &val);
Index: adminserver/admserv/cgi-src40/monreplication.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/monreplication.c,v
retrieving revision 1.6
diff -u -8 -r1.6 monreplication.c
--- adminserver/admserv/cgi-src40/monreplication.c 9 May 2007 00:26:30 -0000 1.6
+++ adminserver/admserv/cgi-src40/monreplication.c 4 Dec 2008 17:37:14 -0000
@@ -17,28 +17,32 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* END COPYRIGHT BLOCK **/
/*
* monreplication.c: Generate form for replication monitoring
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <prtypes.h>
+
#include "libadminutil/resource.h"
#include "libadminutil/distadm.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <signal.h>
#include <sys/types.h>
#include "libadmin/libadmin.h"
-#include "config.h"
-
#define MY_PAGE "monreplication.html"
#define DEF_SIZE "25"
/*
* i18n conversions defines and function;
* properties file = "monreplication.properties"
*/
#define RESOURCE_FILE "monreplication"
Index: adminserver/admserv/cgi-src40/restartsrv.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/restartsrv.c,v
retrieving revision 1.9
diff -u -8 -r1.9 restartsrv.c
--- adminserver/admserv/cgi-src40/restartsrv.c 14 Jul 2008 20:00:02 -0000 1.9
+++ adminserver/admserv/cgi-src40/restartsrv.c 4 Dec 2008 17:37:14 -0000
@@ -31,34 +31,38 @@
* in: op=restart
* out: pid=<Current admin server PID>
*
* Get PID Operation
* in: op=getpid
* out: pid=<Current admin server PID>
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <prtypes.h>
+
#include "libadminutil/admutil.h"
#include "libadminutil/distadm.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <signal.h>
#include <sys/types.h>
#ifdef XP_UNIX
#include <unistd.h>
#include "prthread.h"
#endif
#include "libadminutil/resource.h"
#include "libadmin/libadmin.h"
-#include "config.h"
-
#define RESOURCE_FILE "restartsrv"
#define resource_key(a,b) a b
#define DBT_NO_NEW_PROCESS resource_key(RESOURCE_FILE, "1")
#define DBT_RESTART_ACK resource_key(RESOURCE_FILE, "2")
#define DBT_CANT_STOP_SRV resource_key(RESOURCE_FILE, "3")
Index: adminserver/admserv/cgi-src40/sec-activate.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/sec-activate.c,v
retrieving revision 1.12
diff -u -8 -r1.12 sec-activate.c
--- adminserver/admserv/cgi-src40/sec-activate.c 4 Dec 2008 15:55:39 -0000 1.12
+++ adminserver/admserv/cgi-src40/sec-activate.c 4 Dec 2008 17:37:14 -0000
@@ -21,16 +21,22 @@
/*
* sec-activate.c
*
* Sets the Admin Server encryption information into DS.
* All blame to Adam Prishtina (adam(a)netscape.com)
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <prtypes.h>
+
#include <stdio.h>
#ifdef __cplusplus
extern "C" {
#endif
#include "cert.h"
#include "key.h"
@@ -40,18 +46,16 @@
#include "libadminutil/distadm.h"
#include "libadminutil/admutil.h"
#include "libadminutil/resource.h"
#include "libadmsslutil/psetcssl.h"
#include "libadmsslutil/admsslutil.h"
#include "libadmin/libadmin.h"
-#include "config.h"
-
#ifdef __cplusplus
}
#endif
/*
properties file name = "sec-activate.properties"
*/
#define RESOURCE_FILE "sec-activate"
Index: adminserver/admserv/cgi-src40/security.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/security.c,v
retrieving revision 1.16
diff -u -8 -r1.16 security.c
--- adminserver/admserv/cgi-src40/security.c 3 Dec 2008 17:32:17 -0000 1.16
+++ adminserver/admserv/cgi-src40/security.c 4 Dec 2008 17:37:15 -0000
@@ -13,16 +13,22 @@
* 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 **/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <prtypes.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef __cplusplus
extern "C" {
#endif
#include "nss.h"
@@ -53,18 +59,16 @@
#include "libadminutil/admutil.h"
#include "libadminutil/distadm.h"
#include "libadminutil/resource.h"
#include "libadmsslutil/admsslutil.h"
#include "libadmsslutil/certmgt.h"
#include "libadmsslutil/psetcssl.h"
-#include "config.h"
-
#include "cgicommon.h"
#include "libadmin/libadmin.h"
#ifdef __cplusplus
}
#endif
@@ -773,31 +777,16 @@
if (list_type == SEC_CRL_TYPE) {
fprintf(stdout, "</CRL>\n");
} else if (list_type == SEC_KRL_TYPE) {
fprintf(stdout, "</CKL>\n");
}
}
}
-/*
- * Find a certificate by its nickname.
- * The parameter "certname" can be specified in two ways, as just
- * "certNickname" or "tokenName:certNickname", where the later is
- * a preferred format.
- */
-static CERTCertificate * findCertByNickname(char *certname) {
-
- /* First check PK11 module, then the local database.*/
- CERTCertificate *cert = PK11_FindCertFromNickname(certname, NULL);
- if (!cert) {
- cert = CERT_FindCertByNickname(certdb, certname);
- }
- return cert;
-}
/*
* Find cert by its MD5 Fingerprint.
* The cert nickname is not guaranted to be unique. An existing cert
* should be always identified by it's fingerprint (bug 558903).
*/
static CERTCertificate *findCertByFingerprint(char *fingerprint) {
@@ -1799,38 +1788,16 @@
PK11_NeedUserInit(slot->slot) ? "TRUE" : "FALSE");
fprintf(stdout, "\t</%s>\n", PK11_GetTokenName(slot->slot));
}
fprintf(stdout, "</TOKENINFO>\n");
}
-/* extend an existing env var with additional value */
-static void extend_env(char *var, char *addval) {
- char *oldval = getenv(var);
- char newval[BIG_LINE];
-
- PR_snprintf(newval, sizeof(newval), "%s=%s", var, addval);
- if (oldval) {
- char format[128];
- int max_oldval_len;
- /*
- Because newval is a fixed size buffer, restrict the size of
- oldval that will be copied into the buffer.
- */
- max_oldval_len = sizeof(newval) - strlen (newval)
- -1 /* for additional ':'*/ -1 /*NULL at eos*/;
- PR_snprintf(format, sizeof(format), "%%s=%%s:%%.%ds", max_oldval_len);
-
- PR_snprintf(newval, sizeof(newval), format, var, addval, oldval);
- }
- putenv(strdup(newval));
-}
-
/*
* Add/remove pkcs 11 module from the secmod db
*/
static void moduleOperation(char* op) {
const char *binary = "modutil"; /* PATH and LD_LIBRARY_PATH must already be set correctly */
const char *install_dir = LIBDIR;
const char *database_dir = util_get_security_dir();
char *filename, *filetype, *dllname;
Index: adminserver/admserv/cgi-src40/stopsrv.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/stopsrv.c,v
retrieving revision 1.7
diff -u -8 -r1.7 stopsrv.c
--- adminserver/admserv/cgi-src40/stopsrv.c 15 May 2007 16:45:45 -0000 1.7
+++ adminserver/admserv/cgi-src40/stopsrv.c 4 Dec 2008 17:37:15 -0000
@@ -19,34 +19,37 @@
*
* END COPYRIGHT BLOCK **/
/*
* stopadm.c: Kills the admin server.
*
* Mike McCool
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <prtypes.h>
#include "libadminutil/distadm.h"
#include "libadminutil/admutil.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <signal.h>
#include <sys/types.h>
#ifdef XP_UNIX
#include <unistd.h>
#endif
#include "libadminutil/resource.h"
#include "libadmin/libadmin.h"
-#include "config.h"
-
#define RESOURCE_FILE "stopsrv"
#define resource_key(a,b) a b
#define DBT_NO_NEW_PROCESS resource_key(RESOURCE_FILE, "1")
#define DBT_SHUTDOWN_ACK resource_key(RESOURCE_FILE, "2")
#define DBT_CANT_STOP_SRV resource_key(RESOURCE_FILE, "3")
#define DBT_EXPRESS_SUCCESS resource_key(RESOURCE_FILE, "4")
Index: adminserver/admserv/cgi-src40/ugdsconfig.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ugdsconfig.c,v
retrieving revision 1.11
diff -u -8 -r1.11 ugdsconfig.c
--- adminserver/admserv/cgi-src40/ugdsconfig.c 14 Jul 2008 20:00:02 -0000 1.11
+++ adminserver/admserv/cgi-src40/ugdsconfig.c 4 Dec 2008 17:37:15 -0000
@@ -137,21 +137,16 @@
static void i18nInit() {
i18nResource = res_find_and_init_resource(PROPERTYDIR, RESOURCE_FILE);
if (getenv("HTTP_ACCEPT_LANGUAGE")) {
acceptLanguage = getenv("HTTP_ACCEPT_LANGUAGE");
}
}
-static void i18nCleanup() {
- if (i18nResource != NULL) {
- res_destroy_resource(i18nResource);
- }
-}
static const char *i18nMsg(char *msgid, char *defaultMsg) {
const char *msg=NULL;
static char buf[BUFSIZ]; /* ok - not threaded code */
if (i18nResource) {
msg = res_getstring(i18nResource, msgid, acceptLanguage, buf, sizeof(buf), NULL);
}
if (msg == NULL) {
Index: adminserver/admserv/cgi-src40/viewdata.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/viewdata.c,v
retrieving revision 1.9
diff -u -8 -r1.9 viewdata.c
--- adminserver/admserv/cgi-src40/viewdata.c 14 Jul 2008 20:00:02 -0000 1.9
+++ adminserver/admserv/cgi-src40/viewdata.c 4 Dec 2008 17:37:15 -0000
@@ -18,33 +18,36 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* END COPYRIGHT BLOCK **/
/*
* viewdata.c: View generic server parameters in HTML Admin Interface.
*
* Initial version: 3/11/99 by Adam Prishtina
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <prtypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <base/util.h>
#include "libadminutil/distadm.h"
#include "libadminutil/admutil.h"
#include "libadminutil/resource.h"
#include "libadmsslutil/admsslutil.h"
#include "libadmin/libadmin.h"
#include "libadmin/cluster.h"
#include <ldap_ssl.h>
-#include "config.h"
-
#define MY_PAGE "viewdata.html"
#define NBUF_SIZE 1024
/*
* i18n conversions defines and function;
* properties file = "viewdata.properties"
*/
Index: adminserver/admserv/cgi-src40/viewlog.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/viewlog.c,v
retrieving revision 1.11
diff -u -8 -r1.11 viewlog.c
--- adminserver/admserv/cgi-src40/viewlog.c 14 Jul 2008 20:00:02 -0000 1.11
+++ adminserver/admserv/cgi-src40/viewlog.c 4 Dec 2008 17:37:15 -0000
@@ -19,32 +19,36 @@
*
* END COPYRIGHT BLOCK **/
/*
* viewlog.c: View various log files in HTML Admin interface.
*
* Initial version: 3/11/99 by Adam Prishtina
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <prtypes.h>
+
#include "libadminutil/resource.h"
#include "libadminutil/distadm.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <signal.h>
#include <sys/types.h>
#include "libadmin/libadmin.h"
#include "config.h"
#include "libadmsslutil/psetcssl.h"
#include "libadmsslutil/admsslutil.h"
-#include "config.h"
-
#include "cgicommon.h"
#define MY_PAGE "viewlog.html"
#define DEF_SIZE "25"
#define LOGDIRATTR "nslogdir"
#define ERRORLOGATTR "nserrorlog"
Index: adminserver/include/base/systems.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/base/systems.h,v
retrieving revision 1.5
diff -u -8 -r1.5 systems.h
--- adminserver/include/base/systems.h 1 Aug 2007 18:14:54 -0000 1.5
+++ adminserver/include/base/systems.h 4 Dec 2008 17:37:15 -0000
@@ -20,16 +20,18 @@
* END COPYRIGHT BLOCK **/
#ifndef BASE_SYSTEMS_H
#define BASE_SYSTEMS_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#include <prtypes.h>
+
#ifndef NOINTNSAPI
#define INTNSAPI
#endif /* !NOINTNSAPI */
/*
* systems.h: Lists of defines for systems
*
* This sets what general flavor the system is (UNIX, etc.),
Index: adminserver/include/public/nsapi.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/public/nsapi.h,v
retrieving revision 1.6
diff -u -8 -r1.6 nsapi.h
--- adminserver/include/public/nsapi.h 9 May 2007 00:26:35 -0000 1.6
+++ adminserver/include/public/nsapi.h 4 Dec 2008 17:37:15 -0000
@@ -196,17 +196,17 @@
unsigned char *inbuf; /* for buffer_grab */
int cursize;
int pos;
char *errmsg;
} filebuffer;
/* Return next character or IO_EOF */
-#define filebuf_getc(b) ((b)->pos == (b)->len ? IO_EOF : (int)(long)(unsigned char *)((b)->fp)[(b)->pos++])
+#define filebuf_getc(b) ((b)->pos == (b)->len ? IO_EOF : (int)((b)->fp)[(b)->pos++])
#define filebuf_iseof(b) ((b)->pos == (b)->len)
#else
/* Version of filebuffer with no memory-mapped file support */
typedef struct {
SYS_FILE fd;
Index: adminserver/include/public/base/systems.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/public/base/systems.h,v
retrieving revision 1.4
diff -u -8 -r1.4 systems.h
--- adminserver/include/public/base/systems.h 9 May 2007 00:26:37 -0000 1.4
+++ adminserver/include/public/base/systems.h 4 Dec 2008 17:37:15 -0000
@@ -16,16 +16,18 @@
* 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 **/
#ifndef PUBLIC_BASE_SYSTEMS_H
#define PUBLIC_BASE_SYSTEMS_H
+#include <prtypes.h>
+
/*
* File: systems.h
*
* Description:
*
* This file defines various platform-dependent symbols, which are
* used to configure platform-dependent aspects of the API.
*/
Index: adminserver/lib/base/nscputil.cpp
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/base/nscputil.cpp,v
retrieving revision 1.4
diff -u -8 -r1.4 nscputil.cpp
--- adminserver/lib/base/nscputil.cpp 14 Jul 2008 20:34:43 -0000 1.4
+++ adminserver/lib/base/nscputil.cpp 4 Dec 2008 17:37:15 -0000
@@ -30,16 +30,18 @@
#endif
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
+#include <prtypes.h>
+
#ifdef XP_UNIX
#include <sys/types.h>
#include <sys/wait.h>
#include <stdlib.h>
#include "prthread.h"
#endif /* XP_UNIX */
#include "base/util.h"
Index: adminserver/lib/libadmin/cluster.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libadmin/cluster.c,v
retrieving revision 1.4
diff -u -8 -r1.4 cluster.c
--- adminserver/lib/libadmin/cluster.c 18 Aug 2005 19:20:01 -0000 1.4
+++ adminserver/lib/libadmin/cluster.c 4 Dec 2008 17:37:15 -0000
@@ -19,16 +19,21 @@
*
* END COPYRIGHT BLOCK **/
/*
* cluster.c
*
* Revision History By Whom Note
* 09/12/96 Adrian Chan Initial Version
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <prtypes.h>
#include "libadminutil/admutil.h"
#include "libadminutil/distadm.h"
#include "libadmin/libadmin.h"
#include "libadmin/cluster.h"
#include "base/util.h"
#include <stdio.h>
#include <stdlib.h>
Index: adminserver/lib/libadmin/referer.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libadmin/referer.c,v
retrieving revision 1.7
diff -u -8 -r1.7 referer.c
--- adminserver/lib/libadmin/referer.c 9 May 2007 00:26:37 -0000 1.7
+++ adminserver/lib/libadmin/referer.c 4 Dec 2008 17:37:15 -0000
@@ -28,18 +28,16 @@
#include "libadmin/libadmin.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "prprf.h"
#define REFER_VAR "adminReferer"
-static char *current_referer=NULL;
-
NSAPI_PUBLIC char *
get_referer( char **qqqq )
{
return cookieValue( REFER_VAR, NULL );
}
static char *
fixAddition( char *url, char *addition )
@@ -93,16 +91,16 @@
/* Blame Rob. */
NSAPI_PUBLIC void redirect_to_script(char *script)
{
char urlbuf[BIG_LINE];
char *ptr;
PR_snprintf(urlbuf, sizeof(urlbuf), "%s%s", getenv("SERVER_URL"), getenv("SCRIPT_NAME"));
- if (ptr = strrchr(urlbuf, '/')) {
+ if ((ptr = strrchr(urlbuf, '/'))) {
int maxsize = sizeof(urlbuf)-((ptr-urlbuf)+2); /* one for the '/' and one for the '0' */
PL_strncpyz(ptr + 1, script, maxsize);
} else {
PR_snprintf(urlbuf, sizeof(urlbuf), "%s/%s", getenv("SERVER_URL"), script);
}
printf("Location: %s\n\n", urlbuf);
}
Index: adminserver/lib/libdsa/dsalib_location.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_location.c,v
retrieving revision 1.5
diff -u -8 -r1.5 dsalib_location.c
--- adminserver/lib/libdsa/dsalib_location.c 31 Aug 2007 17:01:38 -0000 1.5
+++ adminserver/lib/libdsa/dsalib_location.c 4 Dec 2008 17:37:15 -0000
@@ -34,17 +34,16 @@
* Returns the instance directory path of the server.
* Info is returned in a static area. The caller must
* copy it for reuse if needed.
*/
DS_EXPORT_SYMBOL char *
ds_get_instance_dir()
{
char *ds_name;
- static char instance_dir[PATH_MAX];
if ( (ds_name = ds_get_server_name()) == NULL ) {
return(NULL);
} else {
return ds_get_config_value(DS_INSTDIR);
}
}
@@ -55,17 +54,17 @@
*/
DS_EXPORT_SYMBOL char *
ds_get_config_dir()
{
char *ds_name;
char *configdir_env;
static char configdir[PATH_MAX];
- if (configdir_env = getenv("DS_CONFIG_DIR")) {
+ if ((configdir_env = getenv("DS_CONFIG_DIR"))) {
return configdir_env;
} else {
if ( (ds_name = ds_get_server_name()) == NULL )
return(NULL);
PR_snprintf(configdir, sizeof(configdir), "%s/%s", INSTCONFIGDIR, ds_name);
return (configdir);
}
}
@@ -93,29 +92,29 @@
char *rundir_env = NULL;
static char rundir[PATH_MAX];
char *inst_dir = NULL;
char *start_script = NULL;
char *p = NULL;
char line[BIG_LINE];
FILE *fp = NULL;
- if (rundir_env = getenv("DS_RUN_DIR")) {
+ if ((rundir_env = getenv("DS_RUN_DIR"))) {
return (rundir_env);
} else {
/* Find the run dir from the start script */
inst_dir = ds_get_instance_dir();
start_script = PR_smprintf("%s%cstart-slapd", inst_dir, FILE_PATHSEP);
fp = fopen(start_script, "r");
if (fp) {
while(fgets(line, BIG_LINE, fp)) {
/* Find line starting with PIDFILE */
if (strncmp(line, "PIDFILE", 7) == 0) {
/* Chop off the pidfile name to get the run dir */
- if (p = strrchr(line, '/')) {
+ if ((p = strrchr(line, '/'))) {
*p = '\0';
PR_snprintf(rundir, sizeof(rundir), "%s", line + 8);
}
break;
}
}
fclose(fp);
}
@@ -147,17 +146,17 @@
* Info is returned in a static area. The caller must copy it
* for reuse if needed.
*/
DS_EXPORT_SYMBOL char *
ds_get_bak_dir()
{
char *bakdir;
- if (bakdir = getenv("DS_BAK_DIR")) {
+ if ((bakdir = getenv("DS_BAK_DIR"))) {
return bakdir;
} else {
return ds_get_config_value(DS_BAKDIR);
}
}
/*
* set bak_dir to environment variable DS_BAK_DIR
@@ -176,17 +175,17 @@
* Info is returned in a static area. The caller must copy it
* for reuse if needed.
*/
DS_EXPORT_SYMBOL char *
ds_get_tmp_dir()
{
char *tmpdir;
- if (tmpdir = getenv("DS_TMP_DIR")) {
+ if ((tmpdir = getenv("DS_TMP_DIR"))) {
return tmpdir;
} else {
return ds_get_config_value(DS_TMPDIR);
}
}
/*
* set bak_dir to environment variable DS_TMP_DIR
Index: adminserver/lib/libdsa/dsalib_util.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_util.c,v
retrieving revision 1.4
diff -u -8 -r1.4 dsalib_util.c
--- adminserver/lib/libdsa/dsalib_util.c 14 Nov 2007 17:51:56 -0000 1.4
+++ adminserver/lib/libdsa/dsalib_util.c 4 Dec 2008 17:37:15 -0000
@@ -15,16 +15,18 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include <prtypes.h>
+
#if defined( XP_WIN32 )
#include <windows.h>
#include <io.h>
#else /* XP_WIN32 */
# if defined( AIXV4 )
# include <fcntl.h>
# else /* AIXV4 */
# include <sys/fcntl.h>
@@ -487,92 +489,16 @@
enum {
DB_DIRECTORY = 0,
DB_LOGDIRECTORY,
DB_CHANGELOGDIRECTORY,
DB_HOME_DIRECTORY
};
-static int
-is_fullpath(char *path)
-{
- int len;
- if (NULL == path || '\0' == *path)
- return 0;
-
- if (FILE_PATHSEP == *path) /* UNIX */
- return 1;
-
- len = strlen(path);
- if (len > 2)
- {
- if (':' == path[1] && ('/' == path[2] || '\\' == path[2])) /* Windows */
- return 1;
- }
- return 0;
-}
-
-static char *
-get_dir_from_startslapd(char *loc, char *keyword)
-{
- char *returnstr = NULL;
- char *ptr = NULL;
- char *confdir = NULL;
-if (ds_search_file(loc, keyword, &returnstr) > 0 && returnstr) {
- ptr = strchr(returnstr, '=');
- if (NULL != ptr) {
- confdir = strdup(++ptr);
- }
- free(returnstr);
- }
- return confdir;
-}
-
-static char *
-get_dir_from_config(char *config_dir, char *config_attr)
-{
- char *configfile = NULL;
- char *returnstr = NULL;
- char *ptr = NULL;
- char *dir = NULL;
- configfile = PR_smprintf("%s%c%s", config_dir, FILE_PATHSEP, DS_CONFIG_FILE);
- if (configfile && ds_search_file(configfile, config_attr, &returnstr) > 0
- && returnstr) {
- ptr = strchr(returnstr, ':');
- if (NULL != ptr) {
- while (' ' == *ptr || '\t' == *ptr) ptr++;
- dir = strdup(ptr);
- }
- free(returnstr);
- PR_smprintf_free(configfile);
- }
- return dir;
-}
-
-static int
-default_err_func(const char *path, const char *op, void *arg)
-{
- PRInt32 errcode = PR_GetError();
- char *msg;
- const char *errtext;
-
- if (!errcode || (errcode == PR_UNKNOWN_ERROR)) {
- errcode = PR_GetOSError();
- errtext = ds_system_errmsg();
- } else {
- errtext = PR_ErrorToString(errcode, PR_LANGUAGE_I_DEFAULT);
- }
-
- msg = PR_smprintf("%s %s: error code %d (%s)", op, path, errcode, errtext);
- ds_send_error(msg, 0);
- PR_smprintf_free(msg);
- return 1; /* just continue */
-}
-
DS_EXPORT_SYMBOL int
ds_remove_reg_key(void *base, const char *format, ...)
{
int rc = 0;
#ifdef XP_WIN32
int retries = 3;
HKEY hkey = (HKEY)base;
char *key;
Index: adminserver/lib/libsi18n/getstrmem.h
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libsi18n/getstrmem.h,v
retrieving revision 1.4
diff -u -8 -r1.4 getstrmem.h
--- adminserver/lib/libsi18n/getstrmem.h 18 Aug 2005 19:20:24 -0000 1.4
+++ adminserver/lib/libsi18n/getstrmem.h 4 Dec 2008 17:37:15 -0000
@@ -26,17 +26,16 @@
} DATABIN;
/* It is intended that this header file be generated by program dblink */
static char emptyString[] = "";
#define NUM_BUCKETS 32 /* must be a power of 2 */
/* strings in library libadmin */
-static char* libadminid[] = {"$DBT: libadmin in memory v1 $"};
static char* libadmin[] = {
"",
" Help ",
" OK ",
" Reset ",
" Done ",
" Cancel ",
emptyString };
@@ -62,17 +61,16 @@
static struct DATABIN bucket4[] = {
{emptyString,NULL,0} };
/* libraries in bucket for hashKey==5 */
static struct DATABIN bucket5[] = {
{emptyString,NULL,0} };
/* strings in library userforms */
-static char* userformsid[] = {"$DBT: userforms in memory v1 $"};
static char* userforms[] = {
"",
"Error: could not open servers list file.<p>\n",
"Error: could not open %s server list file.<p>\n",
"Fedora Server Account",
"Server Account Management for %s",
"Server Account Management",
emptyString };
@@ -86,17 +84,16 @@
static struct DATABIN bucket7[] = {
{emptyString,NULL,0} };
/* libraries in bucket for hashKey==8 */
static struct DATABIN bucket8[] = {
{emptyString,NULL,0} };
/* strings in library libaccess */
-static char* libaccessid[] = {"$DBT: libaccess in memory v1 $"};
static char* libaccess[] = {
"",
"basic-ncsa",
"cannot open database %s",
"basic-ncsa",
"user %s password did not match database %s",
"basic-ncsa",
"cannot open connection to LDAP server on %s:%d",
@@ -247,17 +244,16 @@
{"libaccess",libaccess,146},
{emptyString,NULL,0} };
/* libraries in bucket for hashKey==10 */
static struct DATABIN bucket10[] = {
{emptyString,NULL,0} };
/* strings in library frame */
-static char* frameid[] = {"$DBT: frame in memory v1 $"};
static char* frame[] = {
"",
"<TITLE>Not Found</TITLE><H1>Not Found</H1> The requested object does not exist on this server. The link you followed is either outdated, inaccurate, or the server has been instructed not to let you have it. ",
"Please inform the site administrator of the <A HREF=\"%s\">referring page</A>.",
"Your browser sent a request that this proxy could not understand.",
"Proper authorization is required for the administration of this proxy.\nEither your browser does not perform authorization, or your authorization\nhas failed.",
"Username authentication is required for using this proxy.\nEither your browser does not perform proxy authorization, or your\nauthorization has failed.",
"The proxy's access control configuration denies access to\nthe requested object through this proxy.",
@@ -438,46 +434,43 @@
static struct DATABIN bucket16[] = {
{emptyString,NULL,0} };
/* libraries in bucket for hashKey==17 */
static struct DATABIN bucket17[] = {
{emptyString,NULL,0} };
/* strings in library admserv */
-static char* admservid[] = {"$DBT: admserv in memory v1 $"};
static char* admserv[] = {
"",
"Unauthorized host",
"Invalid URL",
"no filename extension",
"unrecognized type",
"<title>Internal Error</title>\n<h1>Internal Error</h1>\nThe administration server was unable to fulfill your request.<p>\n",
"Reason:",
emptyString };
/* strings in library libir */
-static char* libirid[] = {"$DBT: libadmin in memory v1 $"};
static char* libir[] = {
"",
"An I/O error occurred before all form data could be read.",
emptyString };
/* libraries in bucket for hashKey==18 */
static struct DATABIN bucket18[] = {
{"admserv",admserv,6},
{"libir",libir,1},
{emptyString,NULL,0} };
/* libraries in bucket for hashKey==19 */
static struct DATABIN bucket19[] = {
{emptyString,NULL,0} };
/* strings in library httpdaemon */
-static char* httpdaemonid[] = {"$DBT: httpdaemon in memory v1 $"};
static char* httpdaemon[] = {
"",
"Error in ConvertThreadToFiber",
"Error in ConvertThreadToFiber",
"Error in md_start_system",
"Error in CreateFiber - idlefiber",
"Error in GetQueuedCompletionStatus",
"Error creating completion port",
@@ -513,17 +506,16 @@
emptyString };
/* libraries in bucket for hashKey==20 */
static struct DATABIN bucket20[] = {
{"httpdaemon",httpdaemon,35},
{emptyString,NULL,0} };
/* strings in library dsgw */
-static char* dsgwid[] = {"$DBT: dsgw in memory v1 $"};
static char* dsgw[] = {
"",
"Unknown HTTP request method",
"Invalid or incomplete HTML form data",
"Out of memory",
"Required query/form input is missing",
"Illegal character in file path",
"Bad or missing configuration file",
@@ -829,17 +821,16 @@
static struct DATABIN bucket25[] = {
{emptyString,NULL,0} };
/* libraries in bucket for hashKey==26 */
static struct DATABIN bucket26[] = {
{emptyString,NULL,0} };
/* strings in library base */
-static char* baseid[] = {"$DBT: base in memory v1 $"};
static char* base[] = {
"",
"insufficient memory to create hash table",
"insufficient memory to create hash table",
"cache_destroy: cache tables appear corrupt.",
"unable to allocate hash entry",
"cache_insert: unable to create cache entry",
"HTTP/1.0 200 OK\nContent-type: text/html\n\n",
@@ -1045,17 +1036,16 @@
emptyString };
/* libraries in bucket for hashKey==27 */
static struct DATABIN bucket27[] = {
{"base",base,205},
{emptyString,NULL,0} };
/* strings in library cgiadmin */
-static char* cgiadminid[] = {"$DBT: cgiadmin in memory v1 $"};
static char* cgiadmin[] = {
"",
"Missing REQUEST_METHOD",
"This should only be invoked as CGI program",
"Missing ADMSERV_ROOT",
"This should only be invoked as CGI program",
"Unrecognized request type.",
"Startup",
15 years, 4 months
[Fedora-directory-devel] Please Review: (474254) Default schema ends up in 99user.ldif
by Nathan Kinder
https://bugzilla.redhat.com/show_bug.cgi?id=474254
Resolves: bug 474254
Bug Description: A number of the default attribute and objectclass
definitions
end up in 99user.ldif if you add any custom schema over LDAP. The default
schema definitions should not end up in 99user.ldif.
The cause of these definitions being copied to 99user.ldif are due to
either
duplicate definitions within the default schema, or from missing X-ORIGIN
elements. These two conditions cause DS to think that the schema
definitions
have been redefined, or they are user defined.
Reviewed by: ???
Files: see diff
Branch: HEAD
Fix Description: The fix is to simply remove the duplicates and to add the
missing X-ORIGIN elements.
Platforms tested: F9
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
https://bugzilla.redhat.com/attachment.cgi?id=325450&action=diff
15 years, 4 months