The Samba-Bugzilla – Attachment 8439 Details for
Bug 9541
Add support for posix_openpt
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for v3-6-test
look (text/plain), 3.61 KB, created by
Volker Lendecke
on 2013-01-16 16:12:21 UTC
(
hide
)
Description:
Patch for v3-6-test
Filename:
MIME Type:
Creator:
Volker Lendecke
Created:
2013-01-16 16:12:21 UTC
Size:
3.61 KB
patch
obsolete
>From 35646d361246b51564b4041bbae5ba9e7f602d4c Mon Sep 17 00:00:00 2001 >From: Volker Lendecke <vl@samba.org> >Date: Fri, 11 Jan 2013 10:31:42 +0100 >Subject: [PATCH 1/2] samr: Split up an assignment from an if condition > >--- > source3/rpc_server/samr/srv_samr_chgpasswd.c | 3 ++- > 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 083b048..42fd2d7 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 = sys_open("/dev/ptmx", O_RDWR, 0)) >= 0) { >+ master = sys_open("/dev/ptmx", O_RDWR, 0); >+ if (master >= 0) { > grantpt(master); > unlockpt(master); > line = (char *)ptsname(master); >-- >1.7.3.4 > > >From ab7b3a1c4d33eb09af2b75d051a2cc6d575e2833 Mon Sep 17 00:00:00 2001 >From: Volker Lendecke <vl@samba.org> >Date: Fri, 11 Jan 2013 10:36:04 +0100 >Subject: [PATCH 2/2] samr: Make use of posix_openpt > >--- > source3/configure.in | 2 +- > source3/rpc_server/samr/srv_samr_chgpasswd.c | 4 ++++ > source3/wscript | 2 +- > 3 files changed, 6 insertions(+), 2 deletions(-) > >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 42fd2d7..0b4b25b 100644 >--- a/source3/rpc_server/samr/srv_samr_chgpasswd.c >+++ b/source3/rpc_server/samr/srv_samr_chgpasswd.c >@@ -73,8 +73,12 @@ 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. */ > master = sys_open("/dev/ptmx", O_RDWR, 0); >+#endif > if (master >= 0) { > grantpt(master); > unlockpt(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') >-- >1.7.3.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
jra
:
review+
Actions:
View
Attachments on
bug 9541
:
8385
|
8415
| 8439