mirror of
https://github.com/samba-team/samba.git
synced 2024-12-27 03:21:53 +03:00
a couple of minor merges from 2_2
This commit is contained in:
parent
bfcc6f8827
commit
67aa587eb2
@ -2201,6 +2201,7 @@ static int do_message_op(void)
|
||||
extern FILE *dbf;
|
||||
extern char *optarg;
|
||||
extern int optind;
|
||||
int old_debug;
|
||||
pstring query_host;
|
||||
BOOL message = False;
|
||||
extern char tar_type;
|
||||
@ -2253,9 +2254,11 @@ static int do_message_op(void)
|
||||
|
||||
in_client = True; /* Make sure that we tell lp_load we are */
|
||||
|
||||
old_debug = DEBUGLEVEL;
|
||||
if (!lp_load(servicesf,True,False,False)) {
|
||||
fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf);
|
||||
}
|
||||
DEBUGLEVEL = old_debug;
|
||||
|
||||
codepage_initialise(lp_client_code_page());
|
||||
|
||||
|
@ -95,10 +95,12 @@ static void daemonize(void)
|
||||
static void close_our_files(int client_fd)
|
||||
{
|
||||
int i;
|
||||
struct rlimit limits;
|
||||
|
||||
getrlimit(RLIMIT_NOFILE,&limits);
|
||||
for (1 = 0; i< limits.rlim_max, i++) {
|
||||
if (i == client_fd) continue;
|
||||
for (i = 0; i< limits.rlim_max; i++) {
|
||||
if (i == client_fd)
|
||||
continue;
|
||||
close(i);
|
||||
}
|
||||
}
|
||||
|
@ -59,7 +59,7 @@ static int smb_print(struct cli_state *, char *, FILE *);
|
||||
*server, /* Server name */
|
||||
*printer; /* Printer name */
|
||||
FILE *fp; /* File to print */
|
||||
int status; /* Status of LPD job */
|
||||
int status=0; /* Status of LPD job */
|
||||
struct cli_state *cli; /* SMB interface */
|
||||
|
||||
/* we expect the URI in argv[0]. Detect the case where it is in argv[1] and cope */
|
||||
|
Loading…
Reference in New Issue
Block a user