[Fedora-directory-commits] ldapserver/ldap/servers/slapd schema.c, 1.17, 1.18
by Nathan Kinder
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30611/ldap/servers/slapd
Modified Files:
schema.c
Log Message:
Resolves: 445775
Summary: Avoid replicating default schema when DESC element is an empty string.
Index: schema.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/schema.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- schema.c 13 Nov 2008 23:08:18 -0000 1.17
+++ schema.c 4 Dec 2008 22:33:29 -0000 1.18
@@ -1497,9 +1497,13 @@
(oc->oc_oid) ? oc->oc_oid : "",
oc->oc_name);
/* The DESC (description) is OPTIONAL */
- if (oc_description && *oc_description) {
+ if (oc_description) {
strcat(psbObjectClasses->buffer, " DESC '");
- strcat(psbObjectClasses->buffer, oc_description);
+ /* We want to list an empty description
+ * element if it was defined that way. */
+ if (*oc_description) {
+ strcat(psbObjectClasses->buffer, oc_description);
+ }
strcat(psbObjectClasses->buffer, "'");
need_extra_space = 1;
}
15 years, 4 months
[Fedora-directory-commits] mod_admserv mod_admserv.c,1.34,1.35
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1338
Modified Files:
mod_admserv.c
Log Message:
Fix various compiler warnings about define redefinitions, unused functions/variables, wrong types being cast, etc.
Index: mod_admserv.c
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mod_admserv.c 3 Sep 2008 17:32:51 -0000 1.34
+++ mod_admserv.c 4 Dec 2008 20:01:45 -0000 1.35
@@ -25,7 +25,25 @@
*/
#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"
@@ -43,8 +61,12 @@
#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)
@@ -543,7 +565,7 @@
static apr_status_t close_pipe(void *thefd)
{
- int fd = (int)thefd;
+ int fd = (int)((intptr_t)thefd);
return close(fd);
}
@@ -597,7 +619,7 @@
/* 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 */
@@ -786,7 +808,6 @@
AdmldapInfo info = NULL;
server_rec *s = r->server;
int error = 0;
- char path[PATH_MAX];
char *userGroupLdapURL = NULL;
char *userGroupBindDN = NULL;
char *userGroupBindPW = NULL;
@@ -1192,7 +1213,6 @@
}
static int update_admpwd(char *admroot, char *newuid, char *newpw);
-static int update_adm_conf(char *admroot, char *newpw);
/*
* Miodrag (06-15-98)
@@ -1213,7 +1233,6 @@
char *adminDN = NULL;
LDAPMod mod, *mods[2];
char *vals[2];
- char *attrs[2];
int rval = 0;
int error;
@@ -1318,7 +1337,7 @@
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];
@@ -2215,10 +2234,8 @@
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;
@@ -2447,7 +2464,7 @@
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;
@@ -2459,7 +2476,7 @@
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);
@@ -2519,7 +2536,7 @@
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);
}
@@ -2537,7 +2554,7 @@
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);
}
15 years, 4 months
[Fedora-directory-commits] adminserver/lib/libsi18n getstrmem.h, 1.4, 1.5
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/adminserver/lib/libsi18n
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1119/adminserver/lib/libsi18n
Modified Files:
getstrmem.h
Log Message:
Fix various compiler warnings about define redefinitions, unused functions/variables, wrong types being cast, etc.
Index: getstrmem.h
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libsi18n/getstrmem.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- getstrmem.h 18 Aug 2005 19:20:24 -0000 1.4
+++ getstrmem.h 4 Dec 2008 20:01:30 -0000 1.5
@@ -31,7 +31,6 @@
#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 ",
@@ -67,7 +66,6 @@
{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",
@@ -91,7 +89,6 @@
{emptyString,NULL,0} };
/* strings in library libaccess */
-static char* libaccessid[] = {"$DBT: libaccess in memory v1 $"};
static char* libaccess[] = {
"",
"basic-ncsa",
@@ -252,7 +249,6 @@
{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. ",
@@ -443,7 +439,6 @@
{emptyString,NULL,0} };
/* strings in library admserv */
-static char* admservid[] = {"$DBT: admserv in memory v1 $"};
static char* admserv[] = {
"",
"Unauthorized host",
@@ -455,7 +450,6 @@
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.",
@@ -472,7 +466,6 @@
{emptyString,NULL,0} };
/* strings in library httpdaemon */
-static char* httpdaemonid[] = {"$DBT: httpdaemon in memory v1 $"};
static char* httpdaemon[] = {
"",
"Error in ConvertThreadToFiber",
@@ -518,7 +511,6 @@
{emptyString,NULL,0} };
/* strings in library dsgw */
-static char* dsgwid[] = {"$DBT: dsgw in memory v1 $"};
static char* dsgw[] = {
"",
"Unknown HTTP request method",
@@ -834,7 +826,6 @@
{emptyString,NULL,0} };
/* strings in library base */
-static char* baseid[] = {"$DBT: base in memory v1 $"};
static char* base[] = {
"",
"insufficient memory to create hash table",
@@ -1050,7 +1041,6 @@
{emptyString,NULL,0} };
/* strings in library cgiadmin */
-static char* cgiadminid[] = {"$DBT: cgiadmin in memory v1 $"};
static char* cgiadmin[] = {
"",
"Missing REQUEST_METHOD",
15 years, 4 months
[Fedora-directory-commits] adminserver/lib/libdsa dsalib_location.c, 1.5, 1.6 dsalib_util.c, 1.4, 1.5
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/adminserver/lib/libdsa
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1119/adminserver/lib/libdsa
Modified Files:
dsalib_location.c dsalib_util.c
Log Message:
Fix various compiler warnings about define redefinitions, unused functions/variables, wrong types being cast, etc.
Index: dsalib_location.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_location.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dsalib_location.c 31 Aug 2007 17:01:38 -0000 1.5
+++ dsalib_location.c 4 Dec 2008 20:01:29 -0000 1.6
@@ -39,7 +39,6 @@
ds_get_instance_dir()
{
char *ds_name;
- static char instance_dir[PATH_MAX];
if ( (ds_name = ds_get_server_name()) == NULL ) {
return(NULL);
@@ -60,7 +59,7 @@
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 )
@@ -98,7 +97,7 @@
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 */
@@ -110,7 +109,7 @@
/* 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);
}
@@ -152,7 +151,7 @@
{
char *bakdir;
- if (bakdir = getenv("DS_BAK_DIR")) {
+ if ((bakdir = getenv("DS_BAK_DIR"))) {
return bakdir;
} else {
return ds_get_config_value(DS_BAKDIR);
@@ -181,7 +180,7 @@
{
char *tmpdir;
- if (tmpdir = getenv("DS_TMP_DIR")) {
+ if ((tmpdir = getenv("DS_TMP_DIR"))) {
return tmpdir;
} else {
return ds_get_config_value(DS_TMPDIR);
Index: dsalib_util.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_util.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dsalib_util.c 14 Nov 2007 17:51:56 -0000 1.4
+++ dsalib_util.c 4 Dec 2008 20:01:29 -0000 1.5
@@ -20,6 +20,8 @@
# include <config.h>
#endif
+#include <prtypes.h>
+
#if defined( XP_WIN32 )
#include <windows.h>
#include <io.h>
@@ -492,82 +494,6 @@
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, ...)
{
15 years, 4 months
[Fedora-directory-commits] adminserver/lib/libadmin cluster.c, 1.4, 1.5 referer.c, 1.7, 1.8
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/adminserver/lib/libadmin
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1119/adminserver/lib/libadmin
Modified Files:
cluster.c referer.c
Log Message:
Fix various compiler warnings about define redefinitions, unused functions/variables, wrong types being cast, etc.
Index: cluster.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libadmin/cluster.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cluster.c 18 Aug 2005 19:20:01 -0000 1.4
+++ cluster.c 4 Dec 2008 20:01:29 -0000 1.5
@@ -24,6 +24,11 @@
* 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"
Index: referer.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libadmin/referer.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- referer.c 9 May 2007 00:26:37 -0000 1.7
+++ referer.c 4 Dec 2008 20:01:29 -0000 1.8
@@ -33,8 +33,6 @@
#define REFER_VAR "adminReferer"
-static char *current_referer=NULL;
-
NSAPI_PUBLIC char *
get_referer( char **qqqq )
{
@@ -98,7 +96,7 @@
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 {
15 years, 4 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 admpw.c, 1.9, 1.10 config.c, 1.15, 1.16 download.c, 1.8, 1.9 dsconfig.c, 1.9, 1.10 help.c, 1.11, 1.12 monreplication.c, 1.6, 1.7 restartsrv.c, 1.9, 1.10 sec-activate.c, 1.12, 1.13 security.c, 1.16, 1.17 stopsrv.c, 1.7, 1.8 ugdsconfig.c, 1.11, 1.12 viewdata.c, 1.9, 1.10 viewlog.c, 1.11, 1.12
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1119/adminserver/admserv/cgi-src40
Modified Files:
admpw.c config.c download.c dsconfig.c help.c monreplication.c
restartsrv.c sec-activate.c security.c stopsrv.c ugdsconfig.c
viewdata.c viewlog.c
Log Message:
Fix various compiler warnings about define redefinitions, unused functions/variables, wrong types being cast, etc.
Index: admpw.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/admpw.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- admpw.c 11 May 2007 19:44:05 -0000 1.9
+++ admpw.c 4 Dec 2008 20:01:27 -0000 1.10
@@ -33,6 +33,11 @@
* 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 */
@@ -58,8 +63,6 @@
#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);
@@ -152,11 +155,6 @@
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 */
Index: config.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/config.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config.c 14 Jul 2008 20:00:02 -0000 1.15
+++ config.c 4 Dec 2008 20:01:28 -0000 1.16
@@ -26,6 +26,12 @@
* 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>
@@ -47,8 +53,6 @@
#include "libadmin/install.h"
#include "libadmin/libadmin.h"
-#include "config.h"
-
#ifdef XP_WIN32
#define EADDRINUSE WSAEADDRINUSE
#endif
Index: download.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/download.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- download.c 15 Nov 2007 17:02:02 -0000 1.8
+++ download.c 4 Dec 2008 20:01:28 -0000 1.9
@@ -96,7 +96,6 @@
{
char line[PATH_LENGTH];
FILE *html;
- int i;
char *acceptLanguage = NULL;
char *loc;
@@ -168,4 +167,6 @@
fflush(stdout);
fclose(html);
+
+ return 0;
}
Index: dsconfig.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/dsconfig.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dsconfig.c 18 Jul 2007 22:10:22 -0000 1.9
+++ dsconfig.c 4 Dec 2008 20:01:28 -0000 1.10
@@ -129,11 +129,6 @@
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 */
Index: help.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/help.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- help.c 8 Aug 2007 23:36:04 -0000 1.11
+++ help.c 4 Dec 2008 20:01:28 -0000 1.12
@@ -496,7 +496,6 @@
char *mapfile = NULL;
char path[PATH_LENGTH];
- FILE *frameset = NULL;
FILE *tokenfile = NULL;
int newstyle = 1;
@@ -630,7 +629,7 @@
{
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");
@@ -796,7 +795,6 @@
{
char **name;
char **val;
- char *product;
int cnt;
if (!(localeList = getenv("HTTP_ACCEPT_LANGUAGE")))
Index: monreplication.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/monreplication.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- monreplication.c 9 May 2007 00:26:30 -0000 1.6
+++ monreplication.c 4 Dec 2008 20:01:28 -0000 1.7
@@ -22,6 +22,12 @@
* 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>
@@ -32,8 +38,6 @@
#include <sys/types.h>
#include "libadmin/libadmin.h"
-#include "config.h"
-
#define MY_PAGE "monreplication.html"
#define DEF_SIZE "25"
Index: restartsrv.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/restartsrv.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- restartsrv.c 14 Jul 2008 20:00:02 -0000 1.9
+++ restartsrv.c 4 Dec 2008 20:01:28 -0000 1.10
@@ -36,6 +36,12 @@
* 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>
@@ -52,8 +58,6 @@
#include "libadmin/libadmin.h"
-#include "config.h"
-
#define RESOURCE_FILE "restartsrv"
#define resource_key(a,b) a b
Index: sec-activate.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/sec-activate.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sec-activate.c 4 Dec 2008 15:55:39 -0000 1.12
+++ sec-activate.c 4 Dec 2008 20:01:28 -0000 1.13
@@ -26,6 +26,12 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <prtypes.h>
+
#include <stdio.h>
#ifdef __cplusplus
@@ -45,8 +51,6 @@
#include "libadmin/libadmin.h"
-#include "config.h"
-
#ifdef __cplusplus
}
#endif
Index: security.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/security.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- security.c 3 Dec 2008 17:32:17 -0000 1.16
+++ security.c 4 Dec 2008 20:01:28 -0000 1.17
@@ -18,6 +18,12 @@
* 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>
@@ -58,8 +64,6 @@
#include "libadmsslutil/certmgt.h"
#include "libadmsslutil/psetcssl.h"
-#include "config.h"
-
#include "cgicommon.h"
#include "libadmin/libadmin.h"
@@ -778,21 +782,6 @@
}
}
-/*
- * 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.
@@ -1804,28 +1793,6 @@
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
*/
Index: stopsrv.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/stopsrv.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- stopsrv.c 15 May 2007 16:45:45 -0000 1.7
+++ stopsrv.c 4 Dec 2008 20:01:28 -0000 1.8
@@ -24,6 +24,11 @@
* Mike McCool
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <prtypes.h>
#include "libadminutil/distadm.h"
#include "libadminutil/admutil.h"
@@ -40,8 +45,6 @@
#include "libadmin/libadmin.h"
-#include "config.h"
-
#define RESOURCE_FILE "stopsrv"
#define resource_key(a,b) a b
Index: ugdsconfig.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ugdsconfig.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ugdsconfig.c 14 Jul 2008 20:00:02 -0000 1.11
+++ ugdsconfig.c 4 Dec 2008 20:01:28 -0000 1.12
@@ -142,11 +142,6 @@
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 */
Index: viewdata.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/viewdata.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- viewdata.c 14 Jul 2008 20:00:02 -0000 1.9
+++ viewdata.c 4 Dec 2008 20:01:28 -0000 1.10
@@ -23,6 +23,11 @@
*
* 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>
@@ -38,8 +43,6 @@
#include "libadmin/cluster.h"
#include <ldap_ssl.h>
-#include "config.h"
-
#define MY_PAGE "viewdata.html"
#define NBUF_SIZE 1024
Index: viewlog.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/viewlog.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- viewlog.c 14 Jul 2008 20:00:02 -0000 1.11
+++ viewlog.c 4 Dec 2008 20:01:28 -0000 1.12
@@ -24,6 +24,12 @@
* 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>
@@ -38,8 +44,6 @@
#include "libadmsslutil/psetcssl.h"
#include "libadmsslutil/admsslutil.h"
-#include "config.h"
-
#include "cgicommon.h"
15 years, 4 months
[Fedora-directory-commits] adminserver/include/public/base systems.h, 1.4, 1.5
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/adminserver/include/public/base
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1119/adminserver/include/public/base
Modified Files:
systems.h
Log Message:
Fix various compiler warnings about define redefinitions, unused functions/variables, wrong types being cast, etc.
Index: systems.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/public/base/systems.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- systems.h 9 May 2007 00:26:37 -0000 1.4
+++ systems.h 4 Dec 2008 20:01:29 -0000 1.5
@@ -21,6 +21,8 @@
#ifndef PUBLIC_BASE_SYSTEMS_H
#define PUBLIC_BASE_SYSTEMS_H
+#include <prtypes.h>
+
/*
* File: systems.h
*
15 years, 4 months
[Fedora-directory-commits] adminserver/lib/base nscputil.cpp, 1.4, 1.5
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/adminserver/lib/base
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1119/adminserver/lib/base
Modified Files:
nscputil.cpp
Log Message:
Fix various compiler warnings about define redefinitions, unused functions/variables, wrong types being cast, etc.
Index: nscputil.cpp
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/base/nscputil.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nscputil.cpp 14 Jul 2008 20:34:43 -0000 1.4
+++ nscputil.cpp 4 Dec 2008 20:01:29 -0000 1.5
@@ -35,6 +35,8 @@
#include <ctype.h>
#include <errno.h>
+#include <prtypes.h>
+
#ifdef XP_UNIX
#include <sys/types.h>
#include <sys/wait.h>
15 years, 4 months
[Fedora-directory-commits] adminserver/include/public nsapi.h, 1.6, 1.7
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/adminserver/include/public
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1119/adminserver/include/public
Modified Files:
nsapi.h
Log Message:
Fix various compiler warnings about define redefinitions, unused functions/variables, wrong types being cast, etc.
Index: nsapi.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/public/nsapi.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nsapi.h 9 May 2007 00:26:35 -0000 1.6
+++ nsapi.h 4 Dec 2008 20:01:29 -0000 1.7
@@ -201,7 +201,7 @@
} 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)
15 years, 4 months
[Fedora-directory-commits] adminserver/include/base systems.h, 1.5, 1.6
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/adminserver/include/base
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1119/adminserver/include/base
Modified Files:
systems.h
Log Message:
Fix various compiler warnings about define redefinitions, unused functions/variables, wrong types being cast, etc.
Index: systems.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/base/systems.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- systems.h 1 Aug 2007 18:14:54 -0000 1.5
+++ systems.h 4 Dec 2008 20:01:28 -0000 1.6
@@ -25,6 +25,8 @@
#include "config.h"
#endif
+#include <prtypes.h>
+
#ifndef NOINTNSAPI
#define INTNSAPI
#endif /* !NOINTNSAPI */
15 years, 4 months