summaryrefslogtreecommitdiff
path: root/source4/include
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-08-19 12:16:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:10 -0500
commitbca24a19ebfc8943b46fdb900418e396aef96aa4 (patch)
treef3e95ea487031edfe8c356318c3d248fbc866fac /source4/include
parentf42f0612364045702cea7e66cacd24aa20ecb54e (diff)
downloadsamba-bca24a19ebfc8943b46fdb900418e396aef96aa4.tar.gz
samba-bca24a19ebfc8943b46fdb900418e396aef96aa4.tar.bz2
samba-bca24a19ebfc8943b46fdb900418e396aef96aa4.zip
r1911: merge a few popt parameters from 3.0 move some to better places
and deal with users DOMAIN and lp_workgroup() of the local workstation metze (This used to be commit 1fc0100e44a8640cfc15effb99f5824cb7817da8)
Diffstat (limited to 'source4/include')
-rw-r--r--source4/include/popt_common.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/include/popt_common.h b/source4/include/popt_common.h
index 201245cc3a..e41b1a2cf4 100644
--- a/source4/include/popt_common.h
+++ b/source4/include/popt_common.h
@@ -38,13 +38,14 @@ extern struct poptOption popt_common_credentials[];
#define POPT_COMMON_VERSION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version, 0, "Common samba options:", NULL },
#define POPT_COMMON_CREDENTIALS { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_credentials, 0, "Authentication options:", NULL },
-struct user_auth_info {
+struct cmdline_auth_info {
pstring username;
pstring password;
+ pstring domain;
BOOL got_pass;
BOOL use_kerberos;
};
-extern struct user_auth_info cmdline_auth_info;
+extern struct cmdline_auth_info cmdline_auth_info;
#endif /* _POPT_COMMON_H */