From 94837e2125fec8e75dceee91c09581b7be48309b Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 22 Mar 2003 23:48:02 +0000 Subject: Add -U, -N, -i, -A, -W to popt. (This used to be commit 5a88d78f67fd7853d6f7d5042807afa56091d52c) --- source3/include/popt_common.h | 47 +++++++++++++++++++++++++++++++++++++++++++ source3/include/smb.h | 9 +-------- 2 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 source3/include/popt_common.h (limited to 'source3/include') diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h new file mode 100644 index 0000000000..9354e8734d --- /dev/null +++ b/source3/include/popt_common.h @@ -0,0 +1,47 @@ +/* + Unix SMB/CIFS implementation. + Common popt arguments + Copyright (C) Jelmer Vernooij 2003 + + 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 + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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. +*/ + +#ifndef _POPT_COMMON_H +#define _POPT_COMMON_H + +/* Common popt structures */ +extern struct poptOption popt_common_debug[]; +extern struct poptOption popt_common_configfile[]; +extern struct poptOption popt_common_socket_options[]; +extern struct poptOption popt_common_version[]; +extern struct poptOption popt_common_netbios_name[]; +extern struct poptOption popt_common_log_base[]; +extern struct poptOption popt_common_credentials[]; +extern struct poptOption popt_common_scope[]; + +#define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version, 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; + pstring workgroup; + BOOL got_pass; + BOOL use_kerberos; +}; + +extern struct user_auth_info cmdline_auth_info; + +#endif /* _POPT_COMMON_H */ diff --git a/source3/include/smb.h b/source3/include/smb.h index 0506c410f3..4f37c38413 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1711,14 +1711,7 @@ typedef struct { #define DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH 14 -/* Common popt structures */ - -extern struct poptOption popt_common_debug[]; -extern struct poptOption popt_common_configfile[]; -extern struct poptOption popt_common_socket_options[]; -extern struct poptOption popt_common_version[]; -extern struct poptOption popt_common_netbios_name[]; -extern struct poptOption popt_common_log_base[]; +#include "popt_common.h" /* Module support */ typedef int (init_module_function) (void); -- cgit