Changeset 8e419cb for conf.h

Timestamp:

2006-01-10T21:35:08Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

a4dc9f7

Parents:

3e91c3e (diff), dd8d4c5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge Wilmer

File:

• conf.h (modified) (2 diffs)

conf.h

@@ -27 +27 @@
 #define __CONF_H
 
-typedef enum runmode { RUNMODE_DAEMON, RUNMODE_INETD } runmode_t;
+typedef enum runmode { RUNMODE_DAEMON, RUNMODE_FORKDAEMON, RUNMODE_INETD } runmode_t;
 typedef enum authmode { AUTHMODE_OPEN, AUTHMODE_CLOSED, AUTHMODE_REGISTERED } authmode_t;
 
@@ -38 +38 @@
         runmode_t runmode;
         authmode_t authmode;
-        char *password;
+        char *auth_pass;
+        char *oper_pass;
         char *hostname;
         char *configdir;