Changeset 74

Timestamp:

08/10/06 13:33:04 (2 years ago)

Author:

smoku

Message:

integrated Juha Heinanen's authreg_pam realm handling

Files:

• trunk/c2s/authreg_pam.c (modified) (1 diff)

trunk/c2s/authreg_pam.c

@@ -64 +64 @@
     struct pam_conv conv;
     pam_handle_t *pam;
-    int ret;
+    int ret, user_len, realm_len;
+    char *user_realm = 0;
 
     conv.conv = _ar_pam_conversation;
     conv.appdata_ptr = password;
 
-    ret = pam_start("jabberd", username, &conv, &pam);
+    if (realm) {
+        realm_len = strlen(realm);
+        if (realm_len > 0) {
+            user_len = strlen(username);
+            user_realm = malloc(user_len + realm_len + 2);
+            strcpy(user_realm, username);
+            *(user_realm + user_len) = '@';
+            strcpy(user_realm + user_len + 1, realm);
+        }
+    }
+    if (user_realm) {
+        ret = pam_start("jabberd", user_realm, &conv, &pam);
+    } else {
+        ret = pam_start("jabberd", username, &conv, &pam);
+    }
+    if (user_realm) free(user_realm);
     if(ret != PAM_SUCCESS) {
         log_write(ar->c2s->log, LOG_ERR, "pam: couldn't initialise PAM: %s", pam_strerror(NULL, ret));