Changeset 988 for vendor/current/source3/smbd/utmp.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/smbd/utmp.c (modified) (13 diffs)

vendor/current/source3/smbd/utmp.c

@@ -116 +116 @@
 
 void sys_utmp_claim(const char *username, const char *hostname,
-                        const char *ip_addr_str,
-                        const char *id_str, int id_num)
+                    const char *id_str, int id_num)
 {}
 
 void sys_utmp_yield(const char *username, const char *hostname,
-                        const char *ip_addr_str,
-                        const char *id_str, int id_num)
+                    const char *id_str, int id_num)
 {}
 
 #else /* WITH_UTMP */
 
+#ifdef HAVE_UTMP_H
 #include <utmp.h>
+#endif
 
 #ifdef HAVE_UTMPX_H
@@ -219 +219 @@
         /* For w-files, first look for explicit "wtmp dir" */
         if (uw_name[0] == 'w') {
-                dirname = talloc_strdup(ctx, lp_wtmpdir());
+                dirname = talloc_strdup(ctx, lp_wtmp_directory());
                 if (!dirname) {
                         return NULL;
@@ -228 +228 @@
         /* For u-files and non-explicit w-dir, look for "utmp dir" */
         if ((dirname == NULL) || (strlen(dirname) == 0)) {
-                dirname = talloc_strdup(ctx, lp_utmpdir());
+                dirname = talloc_strdup(ctx, lp_utmp_directory());
                 if (!dirname) {
                         return NULL;
@@ -473 +473 @@
         const char *ut_id_encstr = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
-        fourbyte[0] = 'S';
-        fourbyte[1] = 'M';
-
 /*
- * Encode remaining 2 bytes from 'i'.
  * 'ut_id_encstr' is the character set on which modulo arithmetic is done.
  * Example: digits would produce the base-10 numbers from '001'.
@@ -483 +479 @@
         nbase = strlen(ut_id_encstr);
 
+        fourbyte[0] = ut_id_encstr[i % nbase];
+        i /= nbase;
+        fourbyte[1] = ut_id_encstr[i % nbase];
+        i /= nbase;
         fourbyte[3] = ut_id_encstr[i % nbase];
         i /= nbase;
@@ -488 +488 @@
         i /= nbase;
 
-        return(i);      /* 0: good; else overflow */
+        /* we do not care about overflows as i is a random number */
+        return 0;
 }
 #endif /* defined(HAVE_UT_UT_ID) */
@@ -498 +499 @@
 static bool sys_utmp_fill(struct utmp *u,
                         const char *username, const char *hostname,
-                        const char *ip_addr_str,
                         const char *id_str, int id_num)
 {
@@ -519 +519 @@
          *      If size limit proves troublesome, then perhaps use "ut_id_encode()".
          */
-        if (strlen(id_str) > sizeof(u->ut_line)) {
-                DEBUG(1,("id_str [%s] is too long for %lu char utmp field\n",
-                         id_str, (unsigned long)sizeof(u->ut_line)));
-                return False;
-        }
         utmp_strcpy(u->ut_line, id_str, sizeof(u->ut_line));
 
 #if defined(HAVE_UT_UT_PID)
-        u->ut_pid = sys_getpid();
+        u->ut_pid = getpid();
 #endif
 
@@ -549 +544 @@
         utmp_strcpy(u->ut_host, hostname, sizeof(u->ut_host));
 #endif
-#if defined(HAVE_IPV6) && defined(HAVE_UT_UT_ADDR_V6)
-        memset(&u->ut_addr_v6, '\0', sizeof(u->ut_addr_v6));
-        if (ip_addr_str) {
-                struct in6_addr addr;
-                if (inet_pton(AF_INET6, ip_addr_str, &addr) > 0) {
-                        memcpy(&u->ut_addr_v6, &addr, sizeof(addr));
-                }
-        }
-#elif defined(HAVE_UT_UT_ADDR)
-        memset(&u->ut_addr, '\0', sizeof(u->ut_addr));
-        if (ip_addr_str) {
-                struct in_addr addr;
-                if (inet_pton(AF_INET, ip_addr_str, &addr) > 0) {
-                        memcpy(&u->ut_addr, &addr, sizeof(addr));
-                }
-        }
-        /*
-         * "(unsigned long) ut_addr" apparently exists on at least HP-UX 10.20.
-         * Volunteer to implement, please ...
-         */
-#endif
 
 #if defined(HAVE_UT_UT_ID)
@@ -586 +560 @@
 
 void sys_utmp_yield(const char *username, const char *hostname,
-                        const char *ip_addr_str,
-                        const char *id_str, int id_num)
+                    const char *id_str, int id_num)
 {
         struct utmp u;
@@ -602 +575 @@
 #endif
 
-        if (!sys_utmp_fill(&u, username, hostname, ip_addr_str, id_str, id_num))
+        if (!sys_utmp_fill(&u, username, hostname, id_str, id_num))
                 return;
 
@@ -613 +586 @@
 
 void sys_utmp_claim(const char *username, const char *hostname,
-                        const char *ip_addr_str,
-                        const char *id_str, int id_num)
+                    const char *id_str, int id_num)
 {
         struct utmp u;
@@ -624 +596 @@
 #endif
 
-        if (!sys_utmp_fill(&u, username, hostname, ip_addr_str, id_str, id_num))
+        if (!sys_utmp_fill(&u, username, hostname, id_str, id_num))
                 return;