s3:vfs: Correctly check if OFD locks should be enabled or not
[kai/samba-autobuild/.git] / source3 / lib / util.c
index e296fd5e0f9f87585237094a630b80b37080df27..7530ea6797301e474e54b496b79dc66640f1b8c6 100644 (file)
 #include "includes.h"
 #include "system/passwd.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "util_tdb.h"
 #include "ctdbd_conn.h"
 #include "../lib/util/util_pw.h"
 #include "messages.h"
+#include "messages_dgm.h"
 #include "libcli/security/security.h"
 #include "serverid.h"
-#include "lib/sys_rw.h"
-#include "lib/sys_rw_data.h"
+#include "lib/util/sys_rw.h"
+#include "lib/util/sys_rw_data.h"
+#include "lib/util/util_process.h"
+#include "lib/dbwrap/dbwrap_ctdb.h"
+#include "lib/gencache.h"
 
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
 #define MAX_ALLOC_SIZE (1024*1024*256)
 
 #if (defined(HAVE_NETGROUP) && defined (WITH_AUTOMOUNT))
+/* rpc/xdr.h uses TRUE and FALSE */
+#ifdef TRUE
+#undef TRUE
+#endif
+
+#ifdef FALSE
+#undef FALSE
+#endif
+
+#include "system/nis.h"
+
 #ifdef WITH_NISPLUS_HOME
 #ifdef BROKEN_NISPLUS_INCLUDE_FILES
 /*
@@ -198,7 +214,7 @@ void show_msg(const char *buf)
        if (DEBUGLEVEL < 50)
                bcc = MIN(bcc, 512);
 
-       dump_data(10, (const uint8 *)smb_buf_const(buf), bcc);
+       dump_data(10, (const uint8_t *)smb_buf_const(buf), bcc);
 }
 
 /*******************************************************************
@@ -218,12 +234,12 @@ int set_message_bcc(char *buf,int num_bytes)
  Return the bytes added
 ********************************************************************/
 
-ssize_t message_push_blob(uint8 **outbuf, DATA_BLOB blob)
+ssize_t message_push_blob(uint8_t **outbuf, DATA_BLOB blob)
 {
        size_t newlen = smb_len(*outbuf) + 4 + blob.length;
-       uint8 *tmp;
+       uint8_t *tmp;
 
-       if (!(tmp = talloc_realloc(NULL, *outbuf, uint8, newlen))) {
+       if (!(tmp = talloc_realloc(NULL, *outbuf, uint8_t, newlen))) {
                DEBUG(0, ("talloc failed\n"));
                return -1;
        }
@@ -423,6 +439,7 @@ static void reinit_after_fork_pipe_handler(struct tevent_context *ev,
                 * we have reached EOF on stdin, which means the
                 * parent has exited. Shutdown the server
                 */
+               TALLOC_FREE(fde);
                (void)kill(getpid(), SIGTERM);
        }
 }
@@ -430,21 +447,24 @@ static void reinit_after_fork_pipe_handler(struct tevent_context *ev,
 
 NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
                           struct tevent_context *ev_ctx,
-                          bool parent_longlived)
+                          bool parent_longlived,
+                          const char *comment)
 {
        NTSTATUS status = NT_STATUS_OK;
+       int ret;
+
+       /*
+        * The main process thread should never
+        * allow per_thread_cwd_enable() to be
+        * called.
+        */
+       per_thread_cwd_disable();
 
        if (reinit_after_fork_pipe[1] != -1) {
                close(reinit_after_fork_pipe[1]);
                reinit_after_fork_pipe[1] = -1;
        }
 
-       /* Reset the state of the random
-        * number generation system, so
-        * children do not get the same random
-        * numbers as each other */
-       set_need_random_reseed();
-
        /* tdb needs special fork handling */
        if (tdb_reopen_all(parent_longlived ? 1 : 0) != 0) {
                DEBUG(0,("tdb_reopen_all failed.\n"));
@@ -480,7 +500,22 @@ NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
                        DEBUG(0,("messaging_reinit() failed: %s\n",
                                 nt_errstr(status)));
                }
+
+               if (lp_clustering()) {
+                       ret = ctdb_async_ctx_reinit(
+                               NULL, messaging_tevent_context(msg_ctx));
+                       if (ret != 0) {
+                               DBG_ERR("db_ctdb_async_ctx_reinit failed: %s\n",
+                                       strerror(errno));
+                               return map_nt_error_from_unix(ret);
+                       }
+               }
        }
+
+       if (comment) {
+               prctl_set_comment(comment);
+       }
+
  done:
        return status;
 }
@@ -490,7 +525,7 @@ NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
 ****************************************************************************/
 
 void add_to_large_array(TALLOC_CTX *mem_ctx, size_t element_size,
-                       void *element, void *_array, uint32 *num_elements,
+                       void *element, void *_array, uint32_t *num_elements,
                        ssize_t *array_size)
 {
        void **array = (void **)_array;
@@ -812,145 +847,6 @@ void smb_panic_s3(const char *why)
        dump_core();
 }
 
-/*******************************************************************
- Print a backtrace of the stack to the debug log. This function
- DELIBERATELY LEAKS MEMORY. The expectation is that you should
- exit shortly after calling it.
-********************************************************************/
-
-#ifdef HAVE_LIBUNWIND_H
-#include <libunwind.h>
-#endif
-
-#ifdef HAVE_EXECINFO_H
-#include <execinfo.h>
-#endif
-
-#ifdef HAVE_LIBEXC_H
-#include <libexc.h>
-#endif
-
-void log_stack_trace(void)
-{
-#ifdef HAVE_LIBUNWIND
-       /* Try to use libunwind before any other technique since on ia64
-        * libunwind correctly walks the stack in more circumstances than
-        * backtrace.
-        */ 
-       unw_cursor_t cursor;
-       unw_context_t uc;
-       unsigned i = 0;
-
-       char procname[256];
-       unw_word_t ip, sp, off;
-
-       procname[sizeof(procname) - 1] = '\0';
-
-       if (unw_getcontext(&uc) != 0) {
-               goto libunwind_failed;
-       }
-
-       if (unw_init_local(&cursor, &uc) != 0) {
-               goto libunwind_failed;
-       }
-
-       DEBUG(0, ("BACKTRACE:\n"));
-
-       do {
-           ip = sp = 0;
-           unw_get_reg(&cursor, UNW_REG_IP, &ip);
-           unw_get_reg(&cursor, UNW_REG_SP, &sp);
-
-           switch (unw_get_proc_name(&cursor,
-                       procname, sizeof(procname) - 1, &off) ) {
-           case 0:
-                   /* Name found. */
-           case -UNW_ENOMEM:
-                   /* Name truncated. */
-                   DEBUGADD(0, (" #%u %s + %#llx [ip=%#llx] [sp=%#llx]\n",
-                           i, procname, (long long)off,
-                           (long long)ip, (long long) sp));
-                   break;
-           default:
-           /* case -UNW_ENOINFO: */
-           /* case -UNW_EUNSPEC: */
-                   /* No symbol name found. */
-                   DEBUGADD(0, (" #%u %s [ip=%#llx] [sp=%#llx]\n",
-                           i, "<unknown symbol>",
-                           (long long)ip, (long long) sp));
-           }
-           ++i;
-       } while (unw_step(&cursor) > 0);
-
-       return;
-
-libunwind_failed:
-       DEBUG(0, ("unable to produce a stack trace with libunwind\n"));
-
-#elif HAVE_BACKTRACE_SYMBOLS
-       void *backtrace_stack[BACKTRACE_STACK_SIZE];
-       size_t backtrace_size;
-       char **backtrace_strings;
-
-       /* get the backtrace (stack frames) */
-       backtrace_size = backtrace(backtrace_stack,BACKTRACE_STACK_SIZE);
-       backtrace_strings = backtrace_symbols(backtrace_stack, backtrace_size);
-
-       DEBUG(0, ("BACKTRACE: %lu stack frames:\n", 
-                 (unsigned long)backtrace_size));
-
-       if (backtrace_strings) {
-               int i;
-
-               for (i = 0; i < backtrace_size; i++)
-                       DEBUGADD(0, (" #%u %s\n", i, backtrace_strings[i]));
-
-               /* Leak the backtrace_strings, rather than risk what free() might do */
-       }
-
-#elif HAVE_LIBEXC
-
-       /* The IRIX libexc library provides an API for unwinding the stack. See
-        * libexc(3) for details. Apparantly trace_back_stack leaks memory, but
-        * since we are about to abort anyway, it hardly matters.
-        */
-
-#define NAMESIZE 32 /* Arbitrary */
-
-       __uint64_t      addrs[BACKTRACE_STACK_SIZE];
-       char *          names[BACKTRACE_STACK_SIZE];
-       char            namebuf[BACKTRACE_STACK_SIZE * NAMESIZE];
-
-       int             i;
-       int             levels;
-
-       ZERO_ARRAY(addrs);
-       ZERO_ARRAY(names);
-       ZERO_ARRAY(namebuf);
-
-       /* We need to be root so we can open our /proc entry to walk
-        * our stack. It also helps when we want to dump core.
-        */
-       become_root();
-
-       for (i = 0; i < BACKTRACE_STACK_SIZE; i++) {
-               names[i] = namebuf + (i * NAMESIZE);
-       }
-
-       levels = trace_back_stack(0, addrs, names,
-                       BACKTRACE_STACK_SIZE, NAMESIZE - 1);
-
-       DEBUG(0, ("BACKTRACE: %d stack frames:\n", levels));
-       for (i = 0; i < levels; i++) {
-               DEBUGADD(0, (" #%d 0x%llx %s\n", i, addrs[i], names[i]));
-       }
-#undef NAMESIZE
-
-#else
-       DEBUG(0, ("unable to produce a stack trace on this platform\n"));
-#endif
-}
-
 /*******************************************************************
   A readdir wrapper which just returns the file name.
  ********************************************************************/
@@ -1148,13 +1044,13 @@ void set_namearray(name_compare_entry **ppname_array, const char *namelist_in)
  F_UNLCK in *ptype if the region is unlocked). False if the call failed.
 ****************************************************************************/
 
-bool fcntl_getlock(int fd, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid)
+bool fcntl_getlock(int fd, int op, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid)
 {
        struct flock lock;
        int ret;
 
-       DEBUG(8,("fcntl_getlock fd=%d offset=%.0f count=%.0f type=%d\n",
-                   fd,(double)*poffset,(double)*pcount,*ptype));
+       DEBUG(8,("fcntl_getlock fd=%d op=%d offset=%.0f count=%.0f type=%d\n",
+                   fd,op,(double)*poffset,(double)*pcount,*ptype));
 
        lock.l_type = *ptype;
        lock.l_whence = SEEK_SET;
@@ -1162,7 +1058,7 @@ bool fcntl_getlock(int fd, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppi
        lock.l_len = *pcount;
        lock.l_pid = 0;
 
-       ret = sys_fcntl_ptr(fd,F_GETLK,&lock);
+       ret = sys_fcntl_ptr(fd,op,&lock);
 
        if (ret == -1) {
                int sav = errno;
@@ -1182,6 +1078,34 @@ bool fcntl_getlock(int fd, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppi
        return True;
 }
 
+#if defined(HAVE_OFD_LOCKS)
+int map_process_lock_to_ofd_lock(int op)
+{
+       switch (op) {
+       case F_GETLK:
+       case F_OFD_GETLK:
+               op = F_OFD_GETLK;
+               break;
+       case F_SETLK:
+       case F_OFD_SETLK:
+               op = F_OFD_SETLK;
+               break;
+       case F_SETLKW:
+       case F_OFD_SETLKW:
+               op = F_OFD_SETLKW;
+               break;
+       default:
+               return -1;
+       }
+       return op;
+}
+#else /* HAVE_OFD_LOCKS */
+int map_process_lock_to_ofd_lock(int op)
+{
+       return op;
+}
+#endif /* HAVE_OFD_LOCKS */
+
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_ALL
 
@@ -1198,7 +1122,7 @@ bool is_myname(const char *s)
        for (n=0; my_netbios_names(n); n++) {
                const char *nbt_name = my_netbios_names(n);
 
-               if (strncasecmp_m(nbt_name, s, strlen(nbt_name)) == 0) {
+               if (strncasecmp_m(nbt_name, s, MAX_NETBIOSNAME_LEN-1) == 0) {
                        ret=True;
                        break;
                }
@@ -1228,14 +1152,46 @@ void ra_lanman_string( const char *native_lanman )
                set_remote_arch( RA_WIN2K3 );
 }
 
-static const char *remote_arch_str;
+static const char *remote_arch_strings[] = {
+       [RA_UNKNOWN] =  "UNKNOWN",
+       [RA_WFWG] =     "WfWg",
+       [RA_OS2] =      "OS2",
+       [RA_WIN95] =    "Win95",
+       [RA_WINNT] =    "WinNT",
+       [RA_WIN2K] =    "Win2K",
+       [RA_WINXP] =    "WinXP",
+       [RA_WIN2K3] =   "Win2K3",
+       [RA_VISTA] =    "Vista",
+       [RA_SAMBA] =    "Samba",
+       [RA_CIFSFS] =   "CIFSFS",
+       [RA_WINXP64] =  "WinXP64",
+       [RA_OSX] =      "OSX",
+};
 
 const char *get_remote_arch_str(void)
 {
-       if (!remote_arch_str) {
-               return "UNKNOWN";
+       if (ra_type >= ARRAY_SIZE(remote_arch_strings)) {
+               /*
+                * set_remote_arch() already checks this so ra_type
+                * should be in the allowed range, but anyway, let's
+                * do another bound check here.
+                */
+               DBG_ERR("Remote arch info out of sync [%d] missing\n", ra_type);
+               ra_type = RA_UNKNOWN;
+       }
+       return remote_arch_strings[ra_type];
+}
+
+enum remote_arch_types get_remote_arch_from_str(const char *remote_arch_string)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(remote_arch_strings); i++) {
+               if (strcmp(remote_arch_string, remote_arch_strings[i]) == 0) {
+                       return i;
+               }
        }
-       return remote_arch_str;
+       return RA_UNKNOWN;
 }
 
 /*******************************************************************
@@ -1244,52 +1200,20 @@ const char *get_remote_arch_str(void)
 
 void set_remote_arch(enum remote_arch_types type)
 {
-       ra_type = type;
-       switch( type ) {
-       case RA_WFWG:
-               remote_arch_str = "WfWg";
-               break;
-       case RA_OS2:
-               remote_arch_str = "OS2";
-               break;
-       case RA_WIN95:
-               remote_arch_str = "Win95";
-               break;
-       case RA_WINNT:
-               remote_arch_str = "WinNT";
-               break;
-       case RA_WIN2K:
-               remote_arch_str = "Win2K";
-               break;
-       case RA_WINXP:
-               remote_arch_str = "WinXP";
-               break;
-       case RA_WINXP64:
-               remote_arch_str = "WinXP64";
-               break;
-       case RA_WIN2K3:
-               remote_arch_str = "Win2K3";
-               break;
-       case RA_VISTA:
-               remote_arch_str = "Vista";
-               break;
-       case RA_SAMBA:
-               remote_arch_str = "Samba";
-               break;
-       case RA_CIFSFS:
-               remote_arch_str = "CIFSFS";
-               break;
-       case RA_OSX:
-               remote_arch_str = "OSX";
-               break;
-       default:
+       if (ra_type >= ARRAY_SIZE(remote_arch_strings)) {
+               /*
+                * This protects against someone adding values to enum
+                * remote_arch_types without updating
+                * remote_arch_strings array.
+                */
+               DBG_ERR("Remote arch info out of sync [%d] missing\n", ra_type);
                ra_type = RA_UNKNOWN;
-               remote_arch_str = "UNKNOWN";
-               break;
+               return;
        }
 
+       ra_type = type;
        DEBUG(10,("set_remote_arch: Client arch is \'%s\'\n",
-                               remote_arch_str));
+                 get_remote_arch_str()));
 }
 
 /*******************************************************************
@@ -1301,6 +1225,148 @@ enum remote_arch_types get_remote_arch(void)
        return ra_type;
 }
 
+#define RA_CACHE_TTL 7*24*3600
+
+static bool remote_arch_cache_key(const struct GUID *client_guid,
+                                 fstring key)
+{
+       struct GUID_txt_buf guid_buf;
+       const char *guid_string = NULL;
+
+       guid_string = GUID_buf_string(client_guid, &guid_buf);
+       if (guid_string == NULL) {
+               return false;
+       }
+
+       fstr_sprintf(key, "RA/%s", guid_string);
+       return true;
+}
+
+struct ra_parser_state {
+       bool found;
+       enum remote_arch_types ra;
+};
+
+static void ra_parser(const struct gencache_timeout *t,
+                     DATA_BLOB blob,
+                     void *priv_data)
+{
+       struct ra_parser_state *state = (struct ra_parser_state *)priv_data;
+       const char *ra_str = NULL;
+
+       if (gencache_timeout_expired(t)) {
+               return;
+       }
+
+       if ((blob.length == 0) || (blob.data[blob.length-1] != '\0')) {
+               DBG_ERR("Remote arch cache key not a string\n");
+               return;
+       }
+
+       ra_str = (const char *)blob.data;
+       DBG_INFO("Got remote arch [%s] from cache\n", ra_str);
+
+       state->ra = get_remote_arch_from_str(ra_str);
+       state->found = true;
+       return;
+}
+
+static bool remote_arch_cache_get(const struct GUID *client_guid)
+{
+       bool ok;
+       fstring ra_key;
+       struct ra_parser_state state = (struct ra_parser_state) {
+               .found = false,
+               .ra = RA_UNKNOWN,
+       };
+
+       ok = remote_arch_cache_key(client_guid, ra_key);
+       if (!ok) {
+               return false;
+       }
+
+       ok = gencache_parse(ra_key, ra_parser, &state);
+       if (!ok || !state.found) {
+               return true;
+       }
+
+       if (state.ra == RA_UNKNOWN) {
+               return true;
+       }
+
+       set_remote_arch(state.ra);
+       return true;
+}
+
+static bool remote_arch_cache_set(const struct GUID *client_guid)
+{
+       bool ok;
+       fstring ra_key;
+       const char *ra_str = NULL;
+
+       if (get_remote_arch() == RA_UNKNOWN) {
+               return true;
+       }
+
+       ok = remote_arch_cache_key(client_guid, ra_key);
+       if (!ok) {
+               return false;
+       }
+
+       ra_str = get_remote_arch_str();
+       if (ra_str == NULL) {
+               return false;
+       }
+
+       ok = gencache_set(ra_key, ra_str, time(NULL) + RA_CACHE_TTL);
+       if (!ok) {
+               return false;
+       }
+
+       return true;
+}
+
+bool remote_arch_cache_update(const struct GUID *client_guid)
+{
+       bool ok;
+
+       if (get_remote_arch() == RA_UNKNOWN) {
+
+               become_root();
+               ok = remote_arch_cache_get(client_guid);
+               unbecome_root();
+
+               return ok;
+       }
+
+       become_root();
+       ok = remote_arch_cache_set(client_guid);
+       unbecome_root();
+
+       return ok;
+}
+
+bool remote_arch_cache_delete(const struct GUID *client_guid)
+{
+       bool ok;
+       fstring ra_key;
+
+       ok = remote_arch_cache_key(client_guid, ra_key);
+       if (!ok) {
+               return false;
+       }
+
+       become_root();
+       ok = gencache_del(ra_key);
+       unbecome_root();
+
+       if (!ok) {
+               return false;
+       }
+
+       return true;
+}
+
 const char *tab_depth(int level, int depth)
 {
        if( CHECK_DEBUGLVL(level) ) {
@@ -1494,78 +1560,6 @@ char *myhostname_upper(void)
        return ret;
 }
 
-/**
- * @brief Returns an absolute path to a file concatenating the provided
- * @a rootpath and @a basename
- *
- * @param name Filename, relative to @a rootpath
- *
- * @retval Pointer to a string containing the full path.
- **/
-
-static char *xx_path(const char *name, const char *rootpath)
-{
-       char *fname = NULL;
-
-       fname = talloc_strdup(talloc_tos(), rootpath);
-       if (!fname) {
-               return NULL;
-       }
-       trim_string(fname,"","/");
-
-       if (!directory_exist(fname)) {
-               if (mkdir(fname,0755) == -1) {
-                       /* Did someone else win the race ? */
-                       if (errno != EEXIST) {
-                               DEBUG(1, ("Unable to create directory %s for file %s. "
-                                       "Error was %s\n", fname, name, strerror(errno)));
-                               return NULL;
-                       }
-               }
-       }
-
-       return talloc_asprintf_append(fname, "/%s", name);
-}
-
-/**
- * @brief Returns an absolute path to a file in the Samba lock directory.
- *
- * @param name File to find, relative to LOCKDIR.
- *
- * @retval Pointer to a talloc'ed string containing the full path.
- **/
-
-char *lock_path(const char *name)
-{
-       return xx_path(name, lp_lock_directory());
-}
-
-/**
- * @brief Returns an absolute path to a file in the Samba state directory.
- *
- * @param name File to find, relative to STATEDIR.
- *
- * @retval Pointer to a talloc'ed string containing the full path.
- **/
-
-char *state_path(const char *name)
-{
-       return xx_path(name, lp_state_directory());
-}
-
-/**
- * @brief Returns an absolute path to a file in the Samba cache directory.
- *
- * @param name File to find, relative to CACHEDIR.
- *
- * @retval Pointer to a talloc'ed string containing the full path.
- **/
-
-char *cache_path(const char *name)
-{
-       return xx_path(name, lp_cache_directory());
-}
-
 /*******************************************************************
  Given a filename - get its directory name
 ********************************************************************/
@@ -1609,11 +1603,6 @@ bool ms_has_wild(const char *s)
 {
        char c;
 
-       if (lp_posix_pathnames()) {
-               /* With posix pathnames no characters are wild. */
-               return False;
-       }
-
        while ((c = *s++)) {
                switch (c) {
                case '*':
@@ -1656,7 +1645,7 @@ bool mask_match(const char *string, const char *pattern, bool is_case_sensitive)
        if (ISDOT(pattern))
                return False;
 
-       return ms_fnmatch(pattern, string, Protocol <= PROTOCOL_LANMAN2, is_case_sensitive) == 0;
+       return ms_fnmatch_protocol(pattern, string, Protocol, is_case_sensitive) == 0;
 }
 
 /*******************************************************************
@@ -1689,225 +1678,65 @@ bool mask_match_list(const char *string, char **list, int listLen, bool is_case_
        return False;
 }
 
-/*********************************************************
- Recursive routine that is called by unix_wild_match.
-*********************************************************/
-
-static bool unix_do_match(const char *regexp, const char *str)
-{
-       const char *p;
-
-       for( p = regexp; *p && *str; ) {
-
-               switch(*p) {
-                       case '?':
-                               str++;
-                               p++;
-                               break;
-
-                       case '*':
-
-                               /*
-                                * Look for a character matching 
-                                * the one after the '*'.
-                                */
-                               p++;
-                               if(!*p)
-                                       return true; /* Automatic match */
-                               while(*str) {
-
-                                       while(*str && (*p != *str))
-                                               str++;
-
-                                       /*
-                                        * Patch from weidel@multichart.de. In the case of the regexp
-                                        * '*XX*' we want to ensure there are at least 2 'X' characters
-                                        * in the string after the '*' for a match to be made.
-                                        */
-
-                                       {
-                                               int matchcount=0;
-
-                                               /*
-                                                * Eat all the characters that match, but count how many there were.
-                                                */
-
-                                               while(*str && (*p == *str)) {
-                                                       str++;
-                                                       matchcount++;
-                                               }
-
-                                               /*
-                                                * Now check that if the regexp had n identical characters that
-                                                * matchcount had at least that many matches.
-                                                */
-
-                                               while ( *(p+1) && (*(p+1) == *p)) {
-                                                       p++;
-                                                       matchcount--;
-                                               }
-
-                                               if ( matchcount <= 0 )
-                                                       return false;
-                                       }
-
-                                       str--; /* We've eaten the match char after the '*' */
-
-                                       if(unix_do_match(p, str))
-                                               return true;
-
-                                       if(!*str)
-                                               return false;
-                                       else
-                                               str++;
-                               }
-                               return false;
-
-                       default:
-                               if(*str != *p)
-                                       return false;
-                               str++;
-                               p++;
-                               break;
-               }
-       }
-
-       if(!*p && !*str)
-               return true;
-
-       if (!*p && str[0] == '.' && str[1] == 0)
-               return true;
-
-       if (!*str && *p == '?') {
-               while (*p == '?')
-                       p++;
-               return(!*p);
-       }
-
-       if(!*str && (*p == '*' && p[1] == '\0'))
-               return true;
-
-       return false;
-}
-
-/*******************************************************************
- Simple case insensitive interface to a UNIX wildcard matcher.
- Returns True if match, False if not.
-*******************************************************************/
-
-bool unix_wild_match(const char *pattern, const char *string)
-{
-       TALLOC_CTX *ctx = talloc_stackframe();
-       char *p2;
-       char *s2;
-       char *p;
-       bool ret = false;
-
-       p2 = talloc_strdup(ctx,pattern);
-       s2 = talloc_strdup(ctx,string);
-       if (!p2 || !s2) {
-               TALLOC_FREE(ctx);
-               return false;
-       }
-       if (!strlower_m(p2)) {
-               TALLOC_FREE(ctx);
-               return false;
-       }
-       if (!strlower_m(s2)) {
-               TALLOC_FREE(ctx);
-               return false;
-       }
-
-       /* Remove any *? and ** from the pattern as they are meaningless */
-       for(p = p2; *p; p++) {
-               while( *p == '*' && (p[1] == '?' ||p[1] == '*')) {
-                       memmove(&p[1], &p[2], strlen(&p[2])+1);
-               }
-       }
-
-       if (strequal(p2,"*")) {
-               TALLOC_FREE(ctx);
-               return true;
-       }
-
-       ret = unix_do_match(p2, s2);
-       TALLOC_FREE(ctx);
-       return ret;
-}
-
 /**********************************************************************
- Converts a name to a fully qualified domain name.
- Returns true if lookup succeeded, false if not (then fqdn is set to name)
- Note we deliberately use gethostbyname here, not getaddrinfo as we want
- to examine the h_aliases and I don't know how to do that with getaddrinfo.
-***********************************************************************/
+  Converts a name to a fully qualified domain name.
+  Returns true if lookup succeeded, false if not (then fqdn is set to name)
+  Uses getaddrinfo() with AI_CANONNAME flag to obtain the official
+  canonical name of the host. getaddrinfo() may use a variety of sources
+  including /etc/hosts to obtain the domainname. It expects aliases in
+  /etc/hosts to NOT be the FQDN. The FQDN should come first.
+************************************************************************/
 
 bool name_to_fqdn(fstring fqdn, const char *name)
 {
        char *full = NULL;
-       struct hostent *hp = gethostbyname(name);
+       struct addrinfo hints;
+       struct addrinfo *result;
+       int s;
+
+       /* Configure hints to obtain canonical name */
 
-       if (!hp || !hp->h_name || !*hp->h_name) {
+       memset(&hints, 0, sizeof(struct addrinfo));
+       hints.ai_family = AF_UNSPEC;    /* Allow IPv4 or IPv6 */
+       hints.ai_socktype = SOCK_DGRAM; /* Datagram socket */
+       hints.ai_flags = AI_CANONNAME;  /* Get host's FQDN */
+       hints.ai_protocol = 0;          /* Any protocol */
+
+       s = getaddrinfo(name, NULL, &hints, &result);
+       if (s != 0) {
+               DEBUG(1, ("getaddrinfo: %s\n", gai_strerror(s)));
                DEBUG(10,("name_to_fqdn: lookup for %s failed.\n", name));
                fstrcpy(fqdn, name);
                return false;
        }
+       full = result->ai_canonname;
 
-       /* Find out if the fqdn is returned as an alias
+       /* Find out if the FQDN is returned as an alias
         * to cope with /etc/hosts files where the first
-        * name is not the fqdn but the short name */
-       if (hp->h_aliases && (! strchr_m(hp->h_name, '.'))) {
-               int i;
-               for (i = 0; hp->h_aliases[i]; i++) {
-                       if (strchr_m(hp->h_aliases[i], '.')) {
-                               full = hp->h_aliases[i];
-                               break;
-                       }
-               }
+        * name is not the FQDN but the short name.
+        * getaddrinfo provides no easy way of handling aliases
+        * in /etc/hosts. Users should make sure the FQDN
+        * comes first in /etc/hosts. */
+       if (full && (! strchr_m(full, '.'))) {
+               DEBUG(1, ("WARNING: your /etc/hosts file may be broken!\n"));
+               DEBUGADD(1, ("    Full qualified domain names (FQDNs) should not be specified\n"));
+               DEBUGADD(1, ("    as an alias in /etc/hosts. FQDN should be the first name\n"));
+               DEBUGADD(1, ("    prior to any aliases.\n"));
        }
        if (full && (strcasecmp_m(full, "localhost.localdomain") == 0)) {
                DEBUG(1, ("WARNING: your /etc/hosts file may be broken!\n"));
                DEBUGADD(1, ("    Specifying the machine hostname for address 127.0.0.1 may lead\n"));
                DEBUGADD(1, ("    to Kerberos authentication problems as localhost.localdomain\n"));
                DEBUGADD(1, ("    may end up being used instead of the real machine FQDN.\n"));
-               full = hp->h_name;
-       }
-       if (!full) {
-               full = hp->h_name;
        }
 
        DEBUG(10,("name_to_fqdn: lookup for %s -> %s.\n", name, full));
        fstrcpy(fqdn, full);
+       freeaddrinfo(result);           /* No longer needed */
        return true;
 }
 
-/**********************************************************************
- Append a DATA_BLOB to a talloc'ed object
-***********************************************************************/
-
-void *talloc_append_blob(TALLOC_CTX *mem_ctx, void *buf, DATA_BLOB blob)
-{
-       size_t old_size = 0;
-       char *result;
-
-       if (blob.length == 0) {
-               return buf;
-       }
-
-       if (buf != NULL) {
-               old_size = talloc_get_size(buf);
-       }
-
-       result = (char *)TALLOC_REALLOC(mem_ctx, buf, old_size + blob.length);
-       if (result == NULL) {
-               return NULL;
-       }
-
-       memcpy(result + old_size, blob.data, blob.length);
-       return result;
-}
-
-uint32 map_share_mode_to_deny_mode(uint32 share_access, uint32 private_options)
+uint32_t map_share_mode_to_deny_mode(uint32_t share_access, uint32_t private_options)
 {
        switch (share_access & ~FILE_SHARE_DELETE) {
                case FILE_SHARE_NONE:
@@ -1925,58 +1754,7 @@ uint32 map_share_mode_to_deny_mode(uint32 share_access, uint32 private_options)
                return DENY_FCB;
        }
 
-       return (uint32)-1;
-}
-
-pid_t procid_to_pid(const struct server_id *proc)
-{
-       return proc->pid;
-}
-
-static uint32 my_vnn = NONCLUSTER_VNN;
-
-void set_my_vnn(uint32 vnn)
-{
-       DEBUG(10, ("vnn pid %d = %u\n", (int)getpid(), (unsigned int)vnn));
-       my_vnn = vnn;
-}
-
-uint32 get_my_vnn(void)
-{
-       return my_vnn;
-}
-
-static uint64_t my_unique_id = 0;
-
-void set_my_unique_id(uint64_t unique_id)
-{
-       my_unique_id = unique_id;
-}
-
-struct server_id pid_to_procid(pid_t pid)
-{
-       struct server_id result;
-       result.pid = pid;
-       result.task_id = 0;
-       result.unique_id = my_unique_id;
-       result.vnn = my_vnn;
-       return result;
-}
-
-struct server_id procid_self(void)
-{
-       return pid_to_procid(getpid());
-}
-
-bool procid_is_me(const struct server_id *pid)
-{
-       if (pid->pid != getpid())
-               return False;
-       if (pid->task_id != 0)
-               return False;
-       if (pid->vnn != my_vnn)
-               return False;
-       return True;
+       return (uint32_t)-1;
 }
 
 struct server_id interpret_pid(const char *pid_string)
@@ -1984,21 +1762,6 @@ struct server_id interpret_pid(const char *pid_string)
        return server_id_from_string(get_my_vnn(), pid_string);
 }
 
-char *procid_str_static(const struct server_id *pid)
-{
-       return server_id_str(talloc_tos(), pid);
-}
-
-bool procid_valid(const struct server_id *pid)
-{
-       return (pid->pid != (uint64_t)-1);
-}
-
-bool procid_is_local(const struct server_id *pid)
-{
-       return pid->vnn == my_vnn;
-}
-
 /****************************************************************
  Check if an offset into a buffer is safe.
  If this returns True it's safe to indirect into the byte at
@@ -2087,7 +1850,7 @@ int get_safe_IVAL(const char *buf_base, size_t buf_len, char *ptr, size_t off, i
  call (they take care of winbind separator and other winbind specific settings).
 ****************************************************************/
 
-void split_domain_user(TALLOC_CTX *mem_ctx,
+bool split_domain_user(TALLOC_CTX *mem_ctx,
                       const char *full_name,
                       char **domain,
                       char **user)
@@ -2099,11 +1862,23 @@ void split_domain_user(TALLOC_CTX *mem_ctx,
        if (p != NULL) {
                *domain = talloc_strndup(mem_ctx, full_name,
                                         PTR_DIFF(p, full_name));
+               if (*domain == NULL) {
+                       return false;
+               }
                *user = talloc_strdup(mem_ctx, p+1);
+               if (*user == NULL) {
+                       TALLOC_FREE(*domain);
+                       return false;
+               }
        } else {
-               *domain = talloc_strdup(mem_ctx, "");
+               *domain = NULL;
                *user = talloc_strdup(mem_ctx, full_name);
+               if (*user == NULL) {
+                       return false;
+               }
        }
+
+       return true;
 }
 
 /****************************************************************
@@ -2201,16 +1976,16 @@ bool is_executable(const char *fname)
 
 bool map_open_params_to_ntcreate(const char *smb_base_fname,
                                 int deny_mode, int open_func,
-                                uint32 *paccess_mask,
-                                uint32 *pshare_mode,
-                                uint32 *pcreate_disposition,
-                                uint32 *pcreate_options,
+                                uint32_t *paccess_mask,
+                                uint32_t *pshare_mode,
+                                uint32_t *pcreate_disposition,
+                                uint32_t *pcreate_options,
                                 uint32_t *pprivate_flags)
 {
-       uint32 access_mask;
-       uint32 share_mode;
-       uint32 create_disposition;
-       uint32 create_options = FILE_NON_DIRECTORY_FILE;
+       uint32_t access_mask;
+       uint32_t share_mode;
+       uint32_t create_disposition;
+       uint32_t create_options = FILE_NON_DIRECTORY_FILE;
        uint32_t private_flags = 0;
 
        DEBUG(10,("map_open_params_to_ntcreate: fname = %s, deny_mode = 0x%x, "
@@ -2372,6 +2147,32 @@ struct security_unix_token *copy_unix_token(TALLOC_CTX *ctx, const struct securi
        return cpy;
 }
 
+/****************************************************************************
+ Return a root token
+****************************************************************************/
+
+struct security_unix_token *root_unix_token(TALLOC_CTX *mem_ctx)
+{
+       struct security_unix_token *t = NULL;
+
+       t = talloc_zero(mem_ctx, struct security_unix_token);
+       if (t == NULL) {
+               return NULL;
+       }
+
+       /*
+        * This is not needed, but lets make it explicit, not implicit.
+        */
+       *t = (struct security_unix_token) {
+               .uid = 0,
+               .gid = 0,
+               .ngroups = 0,
+               .groups = NULL
+       };
+
+       return t;
+}
+
 /****************************************************************************
  Check that a file matches a particular file type.
 ****************************************************************************/