diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-20 20:57:41 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-21 09:36:23 +1000 |
| commit | 179a3530d7aace977c6847f165033d9c6b6adba8 (patch) | |
| tree | 2f3f89955f00809181670a43ee0aeff25a16ec5d /source4/lib/cmdline/popt_credentials.c | |
| parent | 5db74b9607f4a5fc5ecaa8be0d744222cd55153c (diff) | |
| download | samba-179a3530d7aace977c6847f165033d9c6b6adba8.tar.gz | |
s4-cmdline: Rename popt tables to avoid symbol conflicts
These same names are use in the source3 popt code, which is called from
in libsmbclient and libnet. These are then included in the smbtorture
binary for testing
Andrew Bartlett
Diffstat (limited to 'source4/lib/cmdline/popt_credentials.c')
| -rw-r--r-- | source4/lib/cmdline/popt_credentials.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c index 6dcef3f22b4..497d2a7228c 100644 --- a/source4/lib/cmdline/popt_credentials.c +++ b/source4/lib/cmdline/popt_credentials.c @@ -168,7 +168,7 @@ static void popt_common_credentials_callback(poptContext con, -struct poptOption popt_common_credentials[] = { +struct poptOption popt_common_credentials4[] = { { NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE|POPT_CBFLAG_POST, (void *)popt_common_credentials_callback }, { "user", 'U', POPT_ARG_STRING, NULL, 'U', "Set the network username", "[DOMAIN/]USERNAME[%PASSWORD]" }, { "no-pass", 'N', POPT_ARG_NONE, &dont_ask, 'N', "Don't ask for a password" }, |