Move sdb_get_homedir() from tools/sysdb to utils/os.

[sysdb.git] / src / utils / os.c

diff --git a/src/utils/os.c b/src/utils/os.c
index d8f707418b9cadb57040ef20473e6ee7d9b1de7d..e975f96e743b6510102426d6450dbe9270690e1c 100644 (file)
--- a/src/utils/os.c
+++ b/src/utils/os.c
@@ -53,6 +53,37 @@
  * public API
  */
 
+char *
+sdb_get_homedir(void)
+{
+       char *username = sdb_get_current_user();
+
+       struct passwd pw_entry;
+       struct passwd *result = NULL;
+
+       char buf[4096];
+
+       int status;
+
+       if (username) {
+               memset(&pw_entry, 0, sizeof(pw_entry));
+               status = getpwnam_r(username, &pw_entry, buf, sizeof(buf), &result);
+       }
+       else
+               status = -1;
+
+       if (status || (! result)) {
+               char errbuf[1024];
+               sdb_log(SDB_LOG_WARNING, "os: Failed to determine home directory "
+                               "for user %s: %s", username,
+                               sdb_strerror(errno, errbuf, sizeof(errbuf)));
+               free(username);
+               return NULL;
+       }
+       free(username);
+       return strdup(result->pw_dir);
+} /* sdb_get_homedir */
+
 int
 sdb_mkdir_all(const char *pathname, mode_t mode)
 {
@@ -152,7 +183,7 @@ sdb_get_current_user(void)
 
        uid_t uid;
 
-       char buf[1024];
+       char buf[4096];
        int status;
 
        uid = geteuid();
@@ -286,6 +317,7 @@ sdb_resolve(int network, const char *address, struct addrinfo **res)
                ai_hints.ai_family = AF_INET6;
        else
                ai_hints.ai_family = AF_UNSPEC;
+
        if ((network & SDB_NET_IP) == SDB_NET_IP) {
                ai_hints.ai_socktype = 0;
                ai_hints.ai_protocol = 0;
@@ -296,7 +328,7 @@ sdb_resolve(int network, const char *address, struct addrinfo **res)
        }
        else if (network & SDB_NET_UDP) {
                ai_hints.ai_socktype = SOCK_DGRAM;
-               ai_hints.ai_socktype = IPPROTO_UDP;
+               ai_hints.ai_protocol = IPPROTO_UDP;
        }
 
        status = getaddrinfo(host, port, &ai_hints, res);