Fix a missing 'no memory' return in last night's svrsvc code, and use

sys_dup2() in a couple more places.

Andrew Bartlett

diff --git a/source/rpc_server/srv_srvsvc_nt.c b/source/rpc_server/srv_srvsvc_nt.c
index b68dcce6726dbe95c4d79f147082fe8a408a71b1..5c1038949b522a4c78641d59ef8b095d2d0a07c6 100644 (file)
--- a/source/rpc_server/srv_srvsvc_nt.c
+++ b/source/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/source/smbd/chgpasswd.c b/source/smbd/chgpasswd.c
index 68871deb90cbdf85e44e5e0baac9b774132ee0ae..094b4683e41550aa84034fc1a835652d75acc7a9 100644 (file)
--- a/source/smbd/chgpasswd.c
+++ b/source/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);