From 645c6518d75c683865a29d1b8c49247a092399da Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 11 Dec 2007 13:16:35 -0800
Subject: Add patches for bug #4866 from jiri sasek - Sun Microsystems - Prague
 Czech Republic <Jiri.Sasek@Sun.COM> - slightly modified - Jiri please check !
  to allow Solaris to get passwords > 8 chars. Jeremy.

(lib/replace part of 657bf8c3479d6192f269e3daef1517e77a9fa9cb metze)
(This used to be commit 9f5c443972a09a70de7c8d6695b08c3730484c6c)
---
 source4/lib/replace/system/passwd.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/lib/replace/system')

diff --git a/source4/lib/replace/system/passwd.h b/source4/lib/replace/system/passwd.h
index 36fca7b4f8..cad3197ccb 100644
--- a/source4/lib/replace/system/passwd.h
+++ b/source4/lib/replace/system/passwd.h
@@ -68,9 +68,13 @@
 #endif
 
 #ifdef REPLACE_GETPASS
+#if defined(REPLACE_GETPASS_BY_GETPASSPHRASE)
+#define getpass(prompt) getpassphrase(prompt)
+#else
 #define getpass(prompt) rep_getpass(prompt)
 char *rep_getpass(const char *prompt);
 #endif
+#endif
 
 #ifndef NGROUPS_MAX
 #define NGROUPS_MAX 32 /* Guess... */
-- 
cgit 


From b1fcae724156c2b25f41264943cf4cec8fe68821 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 17 Dec 2007 10:44:09 -0800
Subject: Fix bug #5121 (unix passwd sync not working on a streams based
 system). Jeremy.

(lib/replace part of 545cd2139cfc9484b733693814d4724d37125942 metze)
(This used to be commit 9cff25cce1d39460dbcab006a309bb2984969eed)
---
 source4/lib/replace/system/network.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/lib/replace/system')

diff --git a/source4/lib/replace/system/network.h b/source4/lib/replace/system/network.h
index e2fad5f686..53bef66d48 100644
--- a/source4/lib/replace/system/network.h
+++ b/source4/lib/replace/system/network.h
@@ -79,6 +79,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);
-- 
cgit 


From adbbc8dcc65997d4c2a555f188a980e6622a309d Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 22 Jan 2008 12:21:55 +0100
Subject: libreplace: getpwent_r/getgrent_r on IRIX are similar to solaris but
 use size_t

metze
(cherry picked from commit 2f460915111066d79f5dc9b4ae4d003918d06852)
(This used to be commit d2ac8be28d3aff59eddbdc6189a255a34c10d502)
---
 source4/lib/replace/system/config.m4 | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'source4/lib/replace/system')

diff --git a/source4/lib/replace/system/config.m4 b/source4/lib/replace/system/config.m4
index 799187af7d..1c05733126 100644
--- a/source4/lib/replace/system/config.m4
+++ b/source4/lib/replace/system/config.m4
@@ -73,6 +73,18 @@ AC_VERIFY_C_PROTOTYPE([struct passwd *getpwent_r(struct passwd *src, char *buf,
 	#include <unistd.h>
 	#include <pwd.h>
 	])
+AC_VERIFY_C_PROTOTYPE([struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)],
+	[
+	#ifndef HAVE_GETPWENT_R_DECL
+	#error missing getpwent_r prototype
+	#endif
+	return NULL;
+	],[
+	AC_DEFINE(SOLARIS_GETPWENT_R, 1, [getpwent_r irix (similar to solaris) function prototype])
+	],[],[
+	#include <unistd.h>
+	#include <pwd.h>
+	])
 AC_CHECK_FUNCS(getgrnam_r getgrgid_r getgrent_r)
 AC_HAVE_DECL(getgrent_r, [
 	#include <unistd.h>
@@ -91,6 +103,19 @@ AC_VERIFY_C_PROTOTYPE([struct group *getgrent_r(struct group *src, char *buf, in
 	#include <grp.h>
 	])
 
+AC_VERIFY_C_PROTOTYPE([struct group *getgrent_r(struct group *src, char *buf, size_t buflen)],
+	[
+	#ifndef HAVE_GETGRENT_R_DECL
+	#error missing getgrent_r prototype
+	#endif
+	return NULL;
+	],[
+	AC_DEFINE(SOLARIS_GETGRENT_R, 1, [getgrent_r irix (similar to solaris)  function prototype])
+	],[],[
+	#include <unistd.h>
+	#include <grp.h>
+	])
+
 # locale
 AC_CHECK_HEADERS(ctype.h locale.h)
 
-- 
cgit