diff options
| author | Herb Lewis <herb@samba.org> | 2001-06-26 20:23:45 +0000 |
|---|---|---|
| committer | Herb Lewis <herb@samba.org> | 2001-06-26 20:23:45 +0000 |
| commit | c2cfcb34e1fdef24ac7979bb0f77340d27fc6926 (patch) | |
| tree | edc77a38be0b70cd843f9f237c96fa7b7bac1c0a /source3/rpc_server | |
| parent | 21fd0a0f6261fb511488e391349ecdb0bf93e12d (diff) | |
| download | samba-c2cfcb34e1fdef24ac7979bb0f77340d27fc6926.tar.gz samba-c2cfcb34e1fdef24ac7979bb0f77340d27fc6926.tar.bz2 samba-c2cfcb34e1fdef24ac7979bb0f77340d27fc6926.zip | |
SGI compiler fixes.
Jeremy
(This used to be commit 45bf995bf62aa6cc176d57e2f954cc2d379717ef)
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 12 | ||||
| -rw-r--r-- | source3/rpc_server/srv_srvsvc_nt.c | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 99830c035b..3fcb08891d 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -4213,7 +4213,6 @@ static BOOL check_printer_ok(NT_PRINTER_INFO_LEVEL_2 *info, int snum) static BOOL add_printer_hook(NT_PRINTER_INFO_LEVEL *printer) { char *cmd = lp_addprinter_cmd(); - char *path; char **qlines; pstring command; pstring driverlocation; @@ -4221,11 +4220,6 @@ static BOOL add_printer_hook(NT_PRINTER_INFO_LEVEL *printer) int ret; int fd; - if (*lp_pathname(lp_servicenumber(PRINTERS_NAME))) - path = lp_pathname(lp_servicenumber(PRINTERS_NAME)); - else - path = lp_lockdir(); - /* build driver path... only 9X architecture is needed for legacy reasons */ slprintf(driverlocation, sizeof(driverlocation)-1, "\\\\%s\\print$\\WIN40\\0", global_myname); @@ -5494,18 +5488,12 @@ static uint32 enumports_level_1(NEW_BUFFER *buffer, uint32 offered, uint32 *need if (*lp_enumports_cmd()) { char *cmd = lp_enumports_cmd(); - char *path; char **qlines; pstring command; int numlines; int ret; int fd; - if (*lp_pathname(lp_servicenumber(PRINTERS_NAME))) - path = lp_pathname(lp_servicenumber(PRINTERS_NAME)); - else - path = lp_lockdir(); - slprintf(command, sizeof(command)-1, "%s \"%d\"", cmd, 1); DEBUG(10,("Running [%s]\n", command)); diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index 902f47f5a2..39e482dc3c 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -1619,7 +1619,7 @@ uint32 _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC get_current_user(&user, p); fstrcpy(user_name, uidtoname(user.uid)); - conn = make_connection(qualname, user_name, "", 0, "A:", user.vuid, &ecode); + conn = make_connection(qualname, user_name, null_pw, 0, "A:", user.vuid, &ecode); if (conn == NULL) { DEBUG(3,("_srv_net_file_query_secdesc: Unable to connect to %s\n", qualname)); |