Attachment 948872 Details for Bug 1146945 – Old prototype patch (for reference only)

[patch] Old prototype patch (for reference only)

krb5_etckrb5confd_prototype001.diff.txt (text/plain), 2.32 KB, created by Roland Mainz on 2014-10-21 10:05:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2014-10-21 10:05:07 UTC

Size: 2.32 KB

patch

obsolete

>diff --git a/src/include/osconf.hin b/src/include/osconf.hin
>index 6f28bc3..681593d 100644
>--- a/src/include/osconf.hin
>+++ b/src/include/osconf.hin
>@@ -50,7 +50,7 @@
> #define KDB5_PLUGIN_BUNDLE_DIR       "/System/Library/KerberosPlugins/KerberosDatabasePlugins"
> #define KRB5_AUTHDATA_PLUGIN_BUNDLE_DIR  "/System/Library/KerberosPlugins/KerberosAuthDataPlugins"
> #else
>-#define DEFAULT_SECURE_PROFILE_PATH     "/etc/krb5.conf@SYSCONFCONF"
>+#define DEFAULT_SECURE_PROFILE_PATH     "/usr/share/krb5/krb5.conf.d/:/etc/krb5.conf.d/:/etc/krb5.conf@SYSCONFCONF"
> #define DEFAULT_PROFILE_PATH        DEFAULT_SECURE_PROFILE_PATH
> #endif
> #endif /* _WINDOWS  */
>diff --git a/src/util/profile/prof_file.c b/src/util/profile/prof_file.c
>index 5611233..d05c883 100644
>--- a/src/util/profile/prof_file.c
>+++ b/src/util/profile/prof_file.c
>@@ -307,6 +307,7 @@ errcode_t profile_update_file_data_locked(prf_data_t data, char **ret_modspec)
>     time_t now;
> #endif
>     FILE *f;
>+    char *dirbuff = NULL;
> 
> #ifdef HAVE_STAT
>     now = time(0);
>@@ -345,20 +346,41 @@ errcode_t profile_update_file_data_locked(prf_data_t data, char **ret_modspec)
>         return 0;
>     }
> #endif
>-    errno = 0;
>-    f = fopen(data->filespec, "r");
>+
>+    if (
>+#ifdef HAVE_STAT
>+    S_ISDIR(st.st_mode) ||
>+#endif
>+    (data->filespec[strlen(data->filespec)] == '/')
>+     )
>+    {
>+        if (asprintf(&dirbuff, "includedir %s\n", data->filespec) < 0)
>+		dirbuff = NULL;
>+	if (dirbuff == NULL)
>+		return ENOMEM;
>+        errno = 0;
>+        f = fmemopen(dirbuff, strlen(dirbuff), "r");
>+    }
>+    else
>+    {
>+        errno = 0;
>+        f = fopen(data->filespec, "r");
>+    }
>     if (f == NULL) {
>         retval = errno;
>         if (retval == 0)
>             retval = ENOENT;
>+	free(dirbuff);
>         return retval;
>     }
>-    set_cloexec_file(f);
>+    if (!dirbuff)
>+    	set_cloexec_file(f);
>     data->upd_serial++;
>     data->flags &= PROFILE_FILE_SHARED;  /* FIXME same as '=' operator */
>     retval = profile_parse_file(f, &data->root, ret_modspec);
>     fclose(f);
>     if (retval) {
>+        free(dirbuff);
>         return retval;
>     }
>     assert(data->root != NULL);
>@@ -366,6 +388,7 @@ errcode_t profile_update_file_data_locked(prf_data_t data, char **ret_modspec)
>     data->timestamp = st.st_mtime;
>     data->frac_ts = frac;
> #endif
>+    free(dirbuff);
>     return 0;
> }
>

Actions: View | Diff

Attachments on bug 1146945: 948872 | 949045