diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-07-28 03:41:50 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-07-28 03:41:50 +0000 |
| commit | 86b7abe54cff1aa3494656f7f3f547f2747e4fce (patch) | |
| tree | a75552c00ee754762eefbecd317235221f218eb3 /source3 | |
| parent | 46d8c28ab6a66a50850de9dc9627fc37d30dc455 (diff) | |
| download | samba-86b7abe54cff1aa3494656f7f3f547f2747e4fce.tar.gz samba-86b7abe54cff1aa3494656f7f3f547f2747e4fce.tar.bz2 samba-86b7abe54cff1aa3494656f7f3f547f2747e4fce.zip | |
Fix a missing 'no memory' return in last night's svrsvc code, and use
sys_dup2() in a couple more places.
Andrew Bartlett
(This used to be commit e69b476626c802b1e1920f241733d0dd6d06a06e)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/rpc_server/srv_srvsvc_nt.c | 2 | ||||
| -rw-r--r-- | source3/smbd/chgpasswd.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index b68dcce672..5c1038949b 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -2086,7 +2086,7 @@ WERROR _srv_net_disk_enum(pipes_struct *p, SRV_Q_NET_DISK_ENUM *q_u, SRV_R_NET_D int dinfo_size = MAX_SERVER_DISK_ENTRIES * sizeof(*dinfo); if(!(dinfo = talloc(ctx, dinfo_size))) { - + return WERR_NOMEM; } r_u->disk_enum_ctr.disk_info = dinfo; diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c index 68871deb90..094b4683e4 100644 --- a/source3/smbd/chgpasswd.c +++ b/source3/smbd/chgpasswd.c @@ -167,17 +167,17 @@ static int dochild(int master, const char *slavedev, const struct passwd *pass, /* Make slave stdin/out/err of child. */ - if (dup2(slave, STDIN_FILENO) != STDIN_FILENO) + if (sys_dup2(slave, STDIN_FILENO) != STDIN_FILENO) { DEBUG(3, ("Could not re-direct stdin\n")); return (False); } - if (dup2(slave, STDOUT_FILENO) != STDOUT_FILENO) + if (sys_dup2(slave, STDOUT_FILENO) != STDOUT_FILENO) { DEBUG(3, ("Could not re-direct stdout\n")); return (False); } - if (dup2(slave, STDERR_FILENO) != STDERR_FILENO) + if (sys_dup2(slave, STDERR_FILENO) != STDERR_FILENO) { DEBUG(3, ("Could not re-direct stderr\n")); return (False); |