[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-2661-g0c5ca21
Volker Lendecke
vlendec at samba.org
Sat Jun 28 14:10:43 GMT 2008
The branch, v3-2-test has been updated
via 0c5ca2127ac6e3c71e369242376d27429c3aee5e (commit)
from 7a853d265b3701a8a0003c4e3771c4a2fa1c6156 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 0c5ca2127ac6e3c71e369242376d27429c3aee5e
Author: Volker Lendecke <vl at samba.org>
Date: Sat Jun 28 16:09:34 2008 +0200
Fix a file descriptor leak in add_port_hook
This was probably cut&paste from add_printer_hook which further down has the
unconditional close(fd). In add_port_hook() we're not interested in the output
of 'addport command', so don't create the out fd.
-----------------------------------------------------------------------
Summary of changes:
source/rpc_server/srv_spoolss_nt.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c
index f3129ac..5fff900 100644
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -6155,7 +6155,6 @@ WERROR add_port_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, const char *portname
char *cmd = lp_addport_cmd();
char *command = NULL;
int ret;
- int fd;
SE_PRIV se_printop = SE_PRINT_OPERATOR;
bool is_print_op = False;
@@ -6179,7 +6178,7 @@ WERROR add_port_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, const char *portname
if ( is_print_op )
become_root();
- ret = smbrun(command, &fd);
+ ret = smbrun(command, NULL);
if ( is_print_op )
unbecome_root();
@@ -6191,8 +6190,6 @@ WERROR add_port_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, const char *portname
TALLOC_FREE(command);
if ( ret != 0 ) {
- if (fd != -1)
- close(fd);
return WERR_ACCESS_DENIED;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list