[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-412-gf19d1e3

[James Peach]

The branch, v3-2-test has been updated
       via  f19d1e3d93d0d9dfe80372c6c5635f1047f9aa88 (commit)
      from  07a9f7daa83c94afefe0d81db4812135121862c2 (commit)

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


- Log -----------------------------------------------------------------
commit f19d1e3d93d0d9dfe80372c6c5635f1047f9aa88
Author: Eric Cronin <ecronin at gizmolabs.org>
Date:   Mon Mar 24 12:33:04 2008 -0700

    Missing HAVE_UPDWTMPX check before using updwtmpx().
    
    In 10.5 Mac OS X added enough utmpx support to make it past the
    first two preprocessor checks around line 390 of src/smbd/utmp.c
    and on to the utmpx block which uses updwtmpx().  Unfortunately,
    as ./configure correctly surmised, 10.5 doesn't have that.
    
    https://bugzilla.samba.org/show_bug.cgi?id=5184

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

Summary of changes:
 source/smbd/utmp.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/utmp.c b/source/smbd/utmp.c
index 5931b2b..de6d707 100644
--- a/source/smbd/utmp.c
+++ b/source/smbd/utmp.c
@@ -409,6 +409,10 @@ static void sys_utmp_update(struct utmp *u, const char *hostname, bool claim)
 	/* Odd.  Have utmpx.h but no "getutmpx()".  Drop to non-x stuff */
 	DEBUG(1,("utmp_update: have utmpx.h but no getutmpx() function\n"));
 	utmp_nox_update(u, claim);
+#elif !defined(HAVE_UPDWTMPX)
+	/* Have utmpx.h but no "updwtmpx()".  Drop to non-x stuff */
+	DEBUG(1,("utmp_update: have utmpx.h but no updwtmpx() function\n"));
+	utmp_nox_update(u, claim);
 #else
 	char *uname = NULL;
 	char *wname = NULL;


-- 
Samba Shared Repository