API: libcrmcommon: Deprecate crm_user_lookup()

Signed-off-by: Reid Wahl <[email protected]>

Author: nrwahl2

include/crm/common/util.h

@@ -45,7 +45,6 @@ int crm_default_remote_port(void);
 int compare_version(const char *version1, const char *version2);
 
 void pcmk_common_cleanup(void);
-int crm_user_lookup(const char *name, uid_t * uid, gid_t * gid);
 
 #ifdef __cplusplus
 }

include/crm/common/util_compat.h

@@ -69,6 +69,9 @@ char *crm_generate_uuid(void);
 //! \deprecated Do not use
 int pcmk_daemon_user(uid_t *uid, gid_t *gid);
 
+//! \deprecated Do not use
+int crm_user_lookup(const char *name, uid_t *uid, gid_t *gid);
+
 #ifdef __cplusplus
 }
 #endif

lib/common/utils.c

@@ -135,38 +135,6 @@ pcmk__lookup_user(const char *name, uid_t *uid, gid_t *gid)
     return pcmk_rc_ok;
 }
 
-int
-crm_user_lookup(const char *name, uid_t * uid, gid_t * gid)
-{
-    int rc = pcmk_ok;
-    char *buffer = NULL;
-    struct passwd pwd;
-    struct passwd *pwentry = NULL;
-
-    buffer = calloc(1, PCMK__PW_BUFFER_LEN);
-    if (buffer == NULL) {
-        return -ENOMEM;
-    }
-
-    rc = getpwnam_r(name, &pwd, buffer, PCMK__PW_BUFFER_LEN, &pwentry);
-    if (pwentry) {
-        if (uid) {
-            *uid = pwentry->pw_uid;
-        }
-        if (gid) {
-            *gid = pwentry->pw_gid;
-        }
-        crm_trace("User %s has uid=%d gid=%d", name, pwentry->pw_uid, pwentry->pw_gid);
-
-    } else {
-        rc = rc? -rc : -EINVAL;
-        crm_info("User %s lookup: %s", name, pcmk_strerror(rc));
-    }
-
-    free(buffer);
-    return rc;
-}
-
 /*!
  * \internal
  * \brief Get user and group IDs of Pacemaker daemon user
@@ -563,6 +531,38 @@ crm_generate_uuid(void)
     return pcmk__generate_uuid();
 }
 
+int
+crm_user_lookup(const char *name, uid_t * uid, gid_t * gid)
+{
+    int rc = pcmk_ok;
+    char *buffer = NULL;
+    struct passwd pwd;
+    struct passwd *pwentry = NULL;
+
+    buffer = calloc(1, PCMK__PW_BUFFER_LEN);
+    if (buffer == NULL) {
+        return -ENOMEM;
+    }
+
+    rc = getpwnam_r(name, &pwd, buffer, PCMK__PW_BUFFER_LEN, &pwentry);
+    if (pwentry) {
+        if (uid) {
+            *uid = pwentry->pw_uid;
+        }
+        if (gid) {
+            *gid = pwentry->pw_gid;
+        }
+        crm_trace("User %s has uid=%d gid=%d", name, pwentry->pw_uid, pwentry->pw_gid);
+
+    } else {
+        rc = rc? -rc : -EINVAL;
+        crm_info("User %s lookup: %s", name, pcmk_strerror(rc));
+    }
+
+    free(buffer);
+    return rc;
+}
+
 int
 pcmk_daemon_user(uid_t *uid, gid_t *gid)
 {