sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

Don't use old usage() function, but the one from popt.

Browse Source 
Remove some useless arguments
This commit is contained in:
Jelmer Vernooij -
parent bd197baa86
commit 8df30059ef
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/nmbd/nmbd.c
View File

@ -601,7 +601,6 @@ static BOOL open_sockets(BOOL isdaemon, int port)
{"hosts", 'H', POPT_ARG_STRING, dyn_LMHOSTSFILE, 'H', "Load a netbios hosts file"},
{"port", 'p', POPT_ARG_INT, &global_nmb_port, NMB_PORT, "Listen on the specified port" },
POPT_COMMON_SAMBA
POPT_COMMON_CONNECTION
{ NULL }
};
pstring logfile;

1
source/nsswitch/winbindd.c
View File

@ -820,7 +820,6 @@ int main(int argc, char **argv)
{ "dual-daemon", 'B', POPT_ARG_VAL, &opt_dual_daemon, True, "Dual daemon mode" },
{ "no-caching", 'n', POPT_ARG_VAL, &opt_nocache, False, "Disable caching" },
POPT_COMMON_SAMBA
POPT_COMMON_CONNECTION
POPT_TABLEEND
};
poptContext pc;

1
source/smbd/server.c
View File

@ -670,7 +670,6 @@ static BOOL init_structs(void )
{"build-options", 'b', POPT_ARG_NONE, NULL, 'b', "Print build options" },
{"port", 'p', POPT_ARG_STRING, &ports, 0, "Listen on the specified ports"},
POPT_COMMON_SAMBA
POPT_COMMON_CONNECTION
{ NULL }
};

14
source/wrepld/server.c
View File

@ -159,15 +159,6 @@ void exit_server(const char *reason)
exit(0);
}
/****************************************************************************
Usage of the program.
****************************************************************************/
static void usage(char *pname)
{
}
/****************************************************************************
Create an fd_set containing all the sockets in the subnet structures,
plus the broadcast sockets.
@ -516,7 +507,6 @@ static void process(void)
{ "interactive", 'i', POPT_ARG_NONE, NULL, 'i', "Run interactive (not a daemon)" },
{ "port", 'p', POPT_ARG_INT, &wins_port, 'p', "Listen on the specified port" },
POPT_COMMON_SAMBA
POPT_COMMON_CONNECTION
POPT_TABLEEND
};
int opt;
@ -539,11 +529,10 @@ static void process(void)
}
}
poptFreeContext(pc);
if (log_stdout && Fork) {
d_printf("Can't log to stdout (-S) unless daemon is in foreground (-F) or interactive (-i)\n");
usage(argv[0]);
poptPrintUsage(pc, stderr, 0);
exit(1);
}
@ -671,6 +660,7 @@ static void process(void)
process();
poptFreeContext(pc);
exit_server("normal exit");
return(0);
}