mirror of
https://github.com/samba-team/samba.git
synced 2025-03-10 12:58:35 +03:00
Our include popt is starting to get a bit old - fixed some compile
problems here. Also fixed some non-constant initialisers in samsync. (This used to be commit 33bd7214736dafd5927d63af5f8510646b81e7df)
This commit is contained in:
parent
c17dc6c55c
commit
362f534fa1
@ -45,5 +45,5 @@ struct poptOption popt_common_debug[] = {
|
||||
{ NULL, 0, POPT_ARG_CALLBACK, debug_callback },
|
||||
{ "debuglevel", 'd', POPT_ARG_INT, NULL, 'd', "Set debug level",
|
||||
"DEBUGLEVEL" },
|
||||
POPT_TABLEEND
|
||||
{ 0 }
|
||||
};
|
||||
|
@ -594,7 +594,7 @@ struct poptOption popt_common_auth_info[] = {
|
||||
"[DOMAIN\\]username[%password]" },
|
||||
{ "domain", 'W', POPT_ARG_STRING, NULL, 'W', "Set domain name",
|
||||
"DOMAIN"},
|
||||
POPT_TABLEEND
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
static BOOL popt_interactive;
|
||||
@ -607,7 +607,7 @@ BOOL popt_common_is_interactive(void)
|
||||
struct poptOption popt_common_interactive[] = {
|
||||
{ "interactive", 'i', POPT_ARG_NONE, &popt_interactive, 'i',
|
||||
"Log to stdout" },
|
||||
POPT_TABLEEND
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
int main(int argc, char **argv)
|
||||
@ -634,7 +634,7 @@ struct poptOption popt_common_interactive[] = {
|
||||
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_auth_info },
|
||||
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_interactive },
|
||||
POPT_AUTOHELP
|
||||
POPT_TABLEEND
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
/* Read command line options */
|
||||
|
Loading…
x
Reference in New Issue
Block a user