s3-popt: Only include popt-common.h when needed.

[nivanova/samba-autobuild/.git] / source3 / include / popt_common.h

diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h
index 9944610c62e13f641ff6afab7de2a444d594f628..040fae9b2171123ee9a56952f1d1399b3c5ff534 100644 (file)
--- a/source3/include/popt_common.h
+++ b/source3/include/popt_common.h
@@ -25,8 +25,10 @@
 /* Common popt structures */
 extern struct poptOption popt_common_samba[];
 extern struct poptOption popt_common_connection[];
+extern struct poptOption popt_common_configfile[];
 extern struct poptOption popt_common_version[];
 extern struct poptOption popt_common_credentials[];
+extern struct poptOption popt_common_debuglevel[];
 extern const struct poptOption popt_common_dynconfig[];
 
 #ifndef POPT_TABLEEND
@@ -36,30 +38,26 @@ extern const struct poptOption popt_common_dynconfig[];
 #define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_samba, 0, "Common samba options:", NULL },
 #define POPT_COMMON_CONNECTION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_connection, 0, "Connection options:", NULL },
 #define POPT_COMMON_VERSION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version, 0, "Common samba options:", NULL },
+#define POPT_COMMON_CONFIGFILE { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile, 0, "Common samba config:", NULL },
 #define POPT_COMMON_CREDENTIALS { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_credentials, 0, "Authentication options:", NULL },
 #define POPT_COMMON_DYNCONFIG { NULL, 0, POPT_ARG_INCLUDE_TABLE, \
     CONST_DISCARD(poptOption *, popt_common_dynconfig), 0, \
     "Build-time configuration overrides:", NULL },
+#define POPT_COMMON_DEBUGLEVEL { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debuglevel, 0, "Common samba debugging:", NULL },
 
 struct user_auth_info {
-       pstring username;
-       pstring password;
-       BOOL got_pass;
-       BOOL use_kerberos;
+       char *username;
+       char *domain;
+       char *password;
+       bool got_pass;
+       bool use_kerberos;
        int signing_state;
+       bool smb_encrypt;
+       bool use_machine_account;
+       bool fallback_after_kerberos;
+       bool use_ccache;
 };
 
-enum smb_server_mode {
-       /* Daemonize and manage our own sockets */
-       SERVER_MODE_DAEMON,
-       /* Don't daemonize or manage sockets */
-       SERVER_MODE_INETD,
-       /* Don't daemonize, but do manage sockets */
-       SERVER_MODE_FOREGROUND,
-       /* Run in the foreground, log to stdout, don't fork children */
-       SERVER_MODE_INTERACTIVE
-};
-
-extern struct user_auth_info cmdline_auth_info;
+void popt_common_set_auth_info(struct user_auth_info *auth_info);
 
 #endif /* _POPT_COMMON_H */