[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-456-g9cff25c

Stefan Metzmacher metze at samba.org
Tue Jan 15 15:03:05 GMT 2008 

The branch, v4-0-test has been updated
       via  9cff25cce1d39460dbcab006a309bb2984969eed (commit)
       via  9f5c443972a09a70de7c8d6695b08c3730484c6c (commit)
       via  8db9e196506f530c780d93e16da590566d16a407 (commit)
       via  db4eabf7cde1008a40a46e5c40a99e9a73cf3ff5 (commit)
       via  ebc08d23f76ecffc90b1fe84c67fc7e6a4c4a6a3 (commit)
      from  ed0c3a0f74c305b3b8554b05c3f97cf79db8296a (commit)

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


- Log -----------------------------------------------------------------
commit 9cff25cce1d39460dbcab006a309bb2984969eed
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.
    
    (lib/replace part of 545cd2139cfc9484b733693814d4724d37125942 metze)

commit 9f5c443972a09a70de7c8d6695b08c3730484c6c
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Dec 11 13:16:35 2007 -0800

    Add patches for bug #4866 from jiri sasek - Sun Microsystems - Prague Czech Republic <Jiri.Sasek at Sun.COM>
    - slightly modified - Jiri please check !  to allow Solaris to get passwords > 8 chars.
    Jeremy.
    
    (lib/replace part of 657bf8c3479d6192f269e3daef1517e77a9fa9cb metze)

commit 8db9e196506f530c780d93e16da590566d16a407
Author: Volker Lendecke <vl at sernet.de>
Date:   Mon Nov 26 15:28:13 2007 +0100

    Fix bug 5055
    
    (lib/replace part of 8bcd2df841bae63e7d58c35d4728b7d853471697 metze)

commit db4eabf7cde1008a40a46e5c40a99e9a73cf3ff5
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 15 18:27:26 2007 -0800

    Add MAX_DNS_NAME_LENGTH, remove more pstrings.
    Jeremy.
    
    (lib/replace part of a1725f4ff7ed375808c78ac661b539557748d0a5 metze)

commit ebc08d23f76ecffc90b1fe84c67fc7e6a4c4a6a3
Author: Jeremy Allison <jra at samba.org>
Date:   Sat Nov 10 22:31:34 2007 -0800

    Always define PATH_MAX. Makes code simpler (removes
    a bunch of #defines). Remove pstring from msdfs.c.
    Jeremy.
    
    (lib/replace part from e203ba22275320808bc11b17361ad1f2d5b0b897 metze)

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

Summary of changes:
 source/lib/replace/getpass.m4       |   10 ++++++++++
 source/lib/replace/libreplace.m4    |    1 +
 source/lib/replace/replace.c        |    2 +-
 source/lib/replace/replace.h        |    8 ++++++++
 source/lib/replace/system/network.h |    4 ++++
 source/lib/replace/system/passwd.h  |    4 ++++
 6 files changed, 28 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/replace/getpass.m4 b/source/lib/replace/getpass.m4
index 17dfdf7..c4da9aa 100644
--- a/source/lib/replace/getpass.m4
+++ b/source/lib/replace/getpass.m4
@@ -1,3 +1,11 @@
+AC_CHECK_FUNC(getpass, samba_cv_HAVE_GETPASS=yes)
+AC_CHECK_FUNC(getpassphrase, samba_cv_HAVE_GETPASSPHRASE=yes)
+if test x"$samba_cv_HAVE_GETPASS" = x"yes" -a x"$samba_cv_HAVE_GETPASSPHRASE" = x"yes"; then
+        AC_DEFINE(REPLACE_GETPASS_BY_GETPASSPHRASE, 1, [getpass returns <9 chars where getpassphrase returns <265 chars])
+	AC_DEFINE(REPLACE_GETPASS,1,[Whether getpass should be replaced])
+	LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
+else
+
 AC_CACHE_CHECK([whether getpass should be replaced],samba_cv_REPLACE_GETPASS,[
 SAVE_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
@@ -12,3 +20,5 @@ if test x"$samba_cv_REPLACE_GETPASS" = x"yes"; then
 	AC_DEFINE(REPLACE_GETPASS,1,[Whether getpass should be replaced])
 	LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
 fi
+
+fi
diff --git a/source/lib/replace/libreplace.m4 b/source/lib/replace/libreplace.m4
index a577285..6d1d6b8 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/replace.c b/source/lib/replace/replace.c
index cec158b..b2a240e 100644
--- a/source/lib/replace/replace.c
+++ b/source/lib/replace/replace.c
@@ -218,7 +218,7 @@ long nap(long milliseconds) {
 #ifndef HAVE_MEMMOVE
 /*******************************************************************
 safely copies memory, ensuring no overlap problems.
-this is only used if the machine does not have it's own memmove().
+this is only used if the machine does not have its own memmove().
 this is not the fastest algorithm in town, but it will do for our
 needs.
 ********************************************************************/
diff --git a/source/lib/replace/replace.h b/source/lib/replace/replace.h
index f8a89a7..3f91544 100644
--- a/source/lib/replace/replace.h
+++ b/source/lib/replace/replace.h
@@ -546,4 +546,12 @@ typedef int bool;
 #define QSORT_CAST (int (*)(const void *, const void *))
 #endif
 
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+
+#ifndef MAX_DNS_NAME_LENGTH
+#define MAX_DNS_NAME_LENGTH 256 /* Actually 255 but +1 for terminating null. */
+#endif
+
 #endif /* _LIBREPLACE_REPLACE_H */
diff --git a/source/lib/replace/system/network.h b/source/lib/replace/system/network.h
index e2fad5f..53bef66 100644
--- a/source/lib/replace/system/network.h
+++ b/source/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);
diff --git a/source/lib/replace/system/passwd.h b/source/lib/replace/system/passwd.h
index 36fca7b..cad3197 100644
--- a/source/lib/replace/system/passwd.h
+++ b/source/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... */


-- 
Samba Shared Repository

More information about the samba-cvs mailing list