summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2007-12-17 15:26:16 -0500
committerSimo Sorce <idra@samba.org>2007-12-17 15:26:16 -0500
commit2e44c4020b09c197e5835f3f646da6e4d5203af2 (patch)
tree495d21635f190e0e2c0c29b7a9ad045c45c5b1a7 /source3
parent4869ccfed6ba8c44fb49844a5a8abbb671518954 (diff)
parent8f28bda7f8c18de597d345126c9ee03e99776e55 (diff)
downloadsamba-2e44c4020b09c197e5835f3f646da6e4d5203af2.tar.gz
samba-2e44c4020b09c197e5835f3f646da6e4d5203af2.tar.bz2
samba-2e44c4020b09c197e5835f3f646da6e4d5203af2.zip
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
(This used to be commit e940537d5be870ae622712a3b76dff891739df8c)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/replace/libreplace.m41
-rw-r--r--source3/lib/replace/system/network.h4
-rw-r--r--source3/smbd/chgpasswd.c14
3 files changed, 12 insertions, 7 deletions
diff --git a/source3/lib/replace/libreplace.m4 b/source3/lib/replace/libreplace.m4
index c10a4b2381..7a5283a4d6 100644
--- a/source3/lib/replace/libreplace.m4
+++ b/source3/lib/replace/libreplace.m4
@@ -100,6 +100,7 @@ AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h)
AC_CHECK_HEADERS(netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
AC_CHECK_HEADERS(sys/sockio.h sys/un.h)
AC_CHECK_HEADERS(sys/mount.h mntent.h)
+AC_CHECK_HEADERS(stropts.h)
dnl we need to check that net/if.h really can be used, to cope with hpux
dnl where including it always fails
diff --git a/source3/lib/replace/system/network.h b/source3/lib/replace/system/network.h
index d3ae2bf398..9087c02da1 100644
--- a/source3/lib/replace/system/network.h
+++ b/source3/lib/replace/system/network.h
@@ -78,6 +78,10 @@
#include <sys/ioctl.h>
#endif
+#ifdef HAVE_STROPTS_H
+#include <stropts.h>
+#endif
+
#ifdef REPLACE_INET_NTOA
/* define is in "replace.h" */
char *rep_inet_ntoa(struct in_addr ip);
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index 5ccf3ed9da..e478122e9b 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -159,19 +159,19 @@ static int dochild(int master, const char *slavedev, const struct passwd *pass,
DEBUG(3, ("More weirdness, could not open %s\n", slavedev));
return (False);
}
-#if defined(I_PUSH) && defined(I_FIND)
+#if defined(TIOCSCTTY)
+ if (ioctl(slave, TIOCSCTTY, 0) < 0)
+ {
+ DEBUG(3, ("Error in ioctl call for slave pty\n"));
+ /* return(False); */
+ }
+#elif defined(I_PUSH) && defined(I_FIND)
if (ioctl(slave, I_FIND, "ptem") == 0) {
ioctl(slave, I_PUSH, "ptem");
}
if (ioctl(slave, I_FIND, "ldterm") == 0) {
ioctl(slave, I_PUSH, "ldterm");
}
-#elif defined(TIOCSCTTY)
- if (ioctl(slave, TIOCSCTTY, 0) < 0)
- {
- DEBUG(3, ("Error in ioctl call for slave pty\n"));
- /* return(False); */
- }
#endif
/* Close master. */