[SCM] Samba Shared Repository - branch v3-6-test updated

Karolin Seeger kseeger at samba.org
Mon Jan 21 03:14:43 MST 2013


The branch, v3-6-test has been updated
       via  cd9c1a0 samr: Make use of posix_openpt
       via  0018441 samr: Split up an assignment from an if condition
      from  329ba78 docs-xml: add dbwrap_tool.1 manual page (fix bug #9568)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit cd9c1a0a3abf0b44afd1054cca9c1da1cace1e52
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jan 11 10:36:04 2013 +0100

    samr: Make use of posix_openpt
    
    The last 2 patches address bug #9541 - Add support for posix_openpt.

commit 00184412950adde1a3db0a16822d771d0868dfc3
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jan 11 10:31:42 2013 +0100

    samr: Split up an assignment from an if condition

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in                         |    2 +-
 source3/rpc_server/samr/srv_samr_chgpasswd.c |    7 ++++++-
 source3/wscript                              |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 0f805ee..458ea39 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1112,7 +1112,7 @@ AC_CHECK_FUNCS(sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetg
 AC_CHECK_FUNCS(initgroups select rdchk getgrnam getgrent pathconf)
 AC_CHECK_FUNCS(getgrset)
 AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf stat64 fstat64)
-AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64)
+AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt posix_openpt lseek64 ftruncate64 posix_fallocate posix_fallocate64)
 AC_CHECK_FUNCS(fallocate fallocate64)
 AC_CHECK_FUNCS(fseeko fseek64 fseeko64 ftell64 ftello64 setluid getpwanam)
 AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64)
diff --git a/source3/rpc_server/samr/srv_samr_chgpasswd.c b/source3/rpc_server/samr/srv_samr_chgpasswd.c
index 083b048..0b4b25b 100644
--- a/source3/rpc_server/samr/srv_samr_chgpasswd.c
+++ b/source3/rpc_server/samr/srv_samr_chgpasswd.c
@@ -73,8 +73,13 @@ static int findpty(char **slave)
 	*slave = NULL;
 
 #if defined(HAVE_GRANTPT)
+#if defined(HAVE_POSIX_OPENPT)
+	master = posix_openpt(O_RDWR|O_NOCTTY);
+#else
 	/* Try to open /dev/ptmx. If that fails, fall through to old method. */
-	if ((master = sys_open("/dev/ptmx", O_RDWR, 0)) >= 0) {
+	master = sys_open("/dev/ptmx", O_RDWR, 0);
+#endif
+	if (master >= 0) {
 		grantpt(master);
 		unlockpt(master);
 		line = (char *)ptsname(master);
diff --git a/source3/wscript b/source3/wscript
index b40848d..bcc6ce1 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -123,7 +123,7 @@ def configure(conf):
     conf.CHECK_FUNCS('sigprocmask sigblock sigaction sigset innetgr')
     conf.CHECK_FUNCS('initgroups select poll rdchk getgrnam getgrent pathconf')
     conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups sysconf stat64 fstat64')
-    conf.CHECK_FUNCS('lstat64 fopen64 atexit grantpt lseek64 ftruncate64 fallocate fallocate64 posix_fallocate posix_fallocate64')
+    conf.CHECK_FUNCS('lstat64 fopen64 atexit grantpt posix_openpt lseek64 ftruncate64 fallocate fallocate64 posix_fallocate posix_fallocate64')
     conf.CHECK_FUNCS('fseeko fseek64 fseeko64 ftell64 ftello64 setluid')
     conf.CHECK_FUNCS('getpwnam', headers='sys/types.h pwd.h')
     conf.CHECK_FUNCS('opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64')


-- 
Samba Shared Repository


More information about the samba-cvs mailing list