[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-697-g545cd21
Jeremy Allison
jra at samba.org
Mon Dec 17 18:44:36 GMT 2007
The branch, v3-2-test has been updated
via 545cd2139cfc9484b733693814d4724d37125942 (commit)
from 6b1a118eaaab405eeef0cf3c0488a2747af562ba (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 545cd2139cfc9484b733693814d4724d37125942
Author: Jeremy Allison <jra at samba.org>
Date: Mon Dec 17 10:44:09 2007 -0800
Fix bug #5121 (unix passwd sync not working on a streams based
system).
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/lib/replace/libreplace.m4 | 1 +
source/lib/replace/system/network.h | 4 ++++
source/smbd/chgpasswd.c | 14 +++++++-------
3 files changed, 12 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/replace/libreplace.m4 b/source/lib/replace/libreplace.m4
index c10a4b2..7a5283a 100644
--- a/source/lib/replace/libreplace.m4
+++ b/source/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/source/lib/replace/system/network.h b/source/lib/replace/system/network.h
index d3ae2bf..9087c02 100644
--- a/source/lib/replace/system/network.h
+++ b/source/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/source/smbd/chgpasswd.c b/source/smbd/chgpasswd.c
index 5ccf3ed..e478122 100644
--- a/source/smbd/chgpasswd.c
+++ b/source/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. */
--
Samba Shared Repository
More information about the samba-cvs
mailing list