From 2cbb879c517f2c756a2eb3962527979bac01ddab Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 7 Feb 2013 13:04:24 -0500
Subject: NSS: Add original homedir to home directory template options

https://fedorahosted.org/sssd/ticket/1805
---
 src/util/sss_nss.c | 14 +++++++++++++-
 src/util/sss_nss.h |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'src/util')

diff --git a/src/util/sss_nss.c b/src/util/sss_nss.c
index ceccda38f..ac36a9ba6 100644
--- a/src/util/sss_nss.c
+++ b/src/util/sss_nss.c
@@ -24,7 +24,7 @@
 
 char *expand_homedir_template(TALLOC_CTX *mem_ctx, const char *template,
                               const char *username, uint32_t uid,
-                              const char *domain)
+                              const char *original, const char *domain)
 {
     char *copy;
     char *p;
@@ -32,6 +32,7 @@ char *expand_homedir_template(TALLOC_CTX *mem_ctx, const char *template,
     char *result = NULL;
     char *res = NULL;
     TALLOC_CTX *tmp_ctx = NULL;
+    const char *orig = NULL;
 
     if (template == NULL) {
         DEBUG(SSSDBG_CRIT_FAILURE, ("Missing template.\n"));
@@ -104,6 +105,17 @@ char *expand_homedir_template(TALLOC_CTX *mem_ctx, const char *template,
                 result = talloc_asprintf_append(result, "%s%s@%s", p,
                                                 username, domain);
                 break;
+            case 'o':
+                if (original == NULL) {
+                    DEBUG(SSSDBG_CRIT_FAILURE,
+                          ("Original home directory for %s is not available, "
+                           "using empty string\n", username));
+                    orig = "";
+                } else {
+                    orig = original;
+                }
+                result = talloc_asprintf_append(result, "%s%s", p, orig);
+                break;
 
             case '%':
                 result = talloc_asprintf_append(result, "%s%%", p);
diff --git a/src/util/sss_nss.h b/src/util/sss_nss.h
index 55e2b7f6b..0520035fd 100644
--- a/src/util/sss_nss.h
+++ b/src/util/sss_nss.h
@@ -27,5 +27,5 @@
 
 char *expand_homedir_template(TALLOC_CTX *mem_ctx, const char *template,
                               const char *username, uint32_t uid,
-                              const char *domain);
+                              const char *original, const char *domain);
 #endif
-- 
cgit