Move copy_unix_token() from locking/locking.c to lib/util.c.

[kai/samba.git] / source3 / include / popt_common.h

diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h
index 380df4860e54e9694d91305f8ae385a0b4b6c215..2125ed6f83afb1823685073e37ba24b1a520f549 100644 (file)
--- a/source3/include/popt_common.h
+++ b/source3/include/popt_common.h
@@ -5,7 +5,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,


@@ -14,31 +14,40 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */
 
 #ifndef _POPT_COMMON_H
 #define _POPT_COMMON_H
 
 */
 
 #ifndef _POPT_COMMON_H
 #define _POPT_COMMON_H
 

+#include <popt.h>
+#include "auth_info.h"
+

 /* Common popt structures */
 extern struct poptOption popt_common_samba[];
 /* 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_credentials[];

+extern struct poptOption popt_common_debuglevel[];
+extern struct poptOption popt_common_option[];
+extern const struct poptOption popt_common_dynconfig[];

 
 #ifndef POPT_TABLEEND
 #define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
 #endif
 
 #define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_samba, 0, "Common samba options:", NULL },
 
 #ifndef POPT_TABLEEND
 #define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
 #endif
 
 #define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_samba, 0, "Common samba options:", NULL },

-#define POPT_CREDENTIALS { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_credentials, 0, "Authentication options:", NULL },
-
-struct user_auth_info {
-       pstring username;
-       pstring password;
-       BOOL got_pass;
-       BOOL use_kerberos;
-};
+#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, \
+    discard_const_p(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 },
+#define POPT_COMMON_OPTION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_option, 0, "Common samba commandline config:", NULL },

 
 

-extern struct user_auth_info cmdline_auth_info;
+void popt_common_set_auth_info(struct user_auth_info *auth_info);

 
 #endif /* _POPT_COMMON_H */
 
 #endif /* _POPT_COMMON_H */