Changeset 208

Timestamp:

05/12/04 00:46:53 (5 years ago)

Author:

svn

Message:

Added the optional use of snprintf for systems without it.
Unindented some preprocessor directives for picky compilers.

Files:

• op/trunk/main.c (modified) (7 diffs)
• op/trunk/Makefile (modified) (1 diff)

op/trunk/main.c

@@ -360 +360 @@
-        if ((pw = getpwuid(getuid())) == NULL) return -1;
-
-       
+
-        if ((cp=FindOpt(cmd, "securid")) != NULL) {
-                memset(&sd_dat, 0, sizeof(sd_dat));   /* clear sd_auth struct */
@@ -370 +370 @@
-                if (sd_auth(sd)) return -1;
-        }
-       
+
-        if ((cp=FindOpt(cmd, "securid")) != NULL) {
-                return logger(LOG_ERR | LOG_PRINT, "SecureID not supported by op. Access denied");
-        }
-       
+
-
-        if ((cp=FindOpt(cmd, "password")) != NULL) {
@@ -405 +405 @@
-                                return logger(LOG_ERR, "Incorrect direct password");
-                } else {
-                       
+
-                        if (strcmp(pw->pw_passwd,"x")==0){ /* Shadow passwords */
-                                if ((spw = getspnam(pw->pw_name)) == NULL)
@@ -411 +411 @@
-                                pw->pw_passwd=spw->sp_pwdp;
-                        }
-                       
+
-
-                        if (!cp && strcmp(crypt(np, pw->pw_passwd), pw->pw_passwd) != 0)
@@ -1034 +1034 @@
-}
-
+#ifndef HAVE_SNPRINTF
+#warning You have not compiled op with snprintf support, presumably because
+#warning your system does not have it. This leaves op potentially open to
+#warning buffer overflows.
+#endif
+
-int vlogger(unsigned level, const char *format, va_list args) {
-char buffer[MAXSTRLEN], buffer2[MAXSTRLEN], buffer3[MAXSTRLEN];
@@ -1040 +1046 @@
-        if (realuser) username = realuser->pw_name;
-
+#ifdef HAVE_SNPRINTF
-        vsnprintf(buffer2, MAXSTRLEN, format, args);
+#else
+        vsprintf(buffer2, format, args);
+#endif
-        if (level & LOG_PRINT) printf("%s\n", buffer2);
-        level &= ~LOG_PRINT;
+#ifdef HAVE_SNPRINTF
-        snprintf(buffer, MAXSTRLEN, "%s =>%s: %s", username, 
-                format_cmd(gargc, gargv, buffer3, MAXSTRLEN),
-                buffer2);
+#else
+        sprintf(buffer, "%s =>%s: %s", username, 
+                format_cmd(gargc, gargv, buffer3, MAXSTRLEN),
+                buffer2);
+#endif
-        syslog(level, "%s", buffer);
-        return -1;
@@ -1064 +1080 @@
-
-        va_start(ap, format);
+#ifdef HAVE_SNPRINTF
-        vsnprintf(buffer, MAXSTRLEN, format, ap);
+#else
+        vsprintf(buffer, format, ap);
+#endif
-        fprintf(stderr, "%s\n", buffer);
-        if (logit) logger(LOG_ERR, "%s", buffer);

op/trunk/Makefile

@@ -23 +23 @@
-#
-#OPTS= -DUSE_SHADOW -g
-
+DHAVE_SNPRINTF -
-LDFLAGS = -g
-#