[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
Richard Allen Megginson
rmeggins at fedoraproject.org
Thu Dec 4 20:01:31 UTC 2008
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"
More information about the Fedora-directory-commits
mailing list