summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-01-11 10:31:42 +0100
committerJeremy Allison <jra@samba.org>2013-01-14 09:01:26 -0800
commitbef944166ab5b5e6dcceaeb4655b20bd7f2fc4d2 (patch)
treedd537f243a934f480b5ce5cb666a3c332ddb12d1
parent813bd0353fda0eb6d7c78392d5abd3002115da96 (diff)
downloadsamba-bef944166ab5b5e6dcceaeb4655b20bd7f2fc4d2.tar.gz
samba-bef944166ab5b5e6dcceaeb4655b20bd7f2fc4d2.tar.bz2
samba-bef944166ab5b5e6dcceaeb4655b20bd7f2fc4d2.zip
samr: Split up an assignment from an if condition
Reviewed by: Jeremy Allison <jra@samba.org>
-rw-r--r--source3/rpc_server/samr/srv_samr_chgpasswd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/rpc_server/samr/srv_samr_chgpasswd.c b/source3/rpc_server/samr/srv_samr_chgpasswd.c
index 51c0d0f96a..3d04899a53 100644
--- a/source3/rpc_server/samr/srv_samr_chgpasswd.c
+++ b/source3/rpc_server/samr/srv_samr_chgpasswd.c
@@ -74,7 +74,8 @@ static int findpty(char **slave)
#if defined(HAVE_GRANTPT)
/* Try to open /dev/ptmx. If that fails, fall through to old method. */
- if ((master = open("/dev/ptmx", O_RDWR, 0)) >= 0) {
+ master = open("/dev/ptmx", O_RDWR, 0);
+ if (master >= 0) {
grantpt(master);
unlockpt(master);
line = (char *)ptsname(master);