Changeset 745 for trunk/server/source4/lib/tls/tls.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/lib/tls/tls.c (modified) (3 diffs)

trunk/server/source4/lib/tls/tls.c

@@ -358 +358 @@
         int ret;
         TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
-        const char *keyfile = lp_tls_keyfile(tmp_ctx, lp_ctx);
-        const char *certfile = lp_tls_certfile(tmp_ctx, lp_ctx);
-        const char *cafile = lp_tls_cafile(tmp_ctx, lp_ctx);
-        const char *crlfile = lp_tls_crlfile(tmp_ctx, lp_ctx);
-        const char *dhpfile = lp_tls_dhpfile(tmp_ctx, lp_ctx);
+        const char *keyfile = lpcfg_tls_keyfile(tmp_ctx, lp_ctx);
+        const char *certfile = lpcfg_tls_certfile(tmp_ctx, lp_ctx);
+        const char *cafile = lpcfg_tls_cafile(tmp_ctx, lp_ctx);
+        const char *crlfile = lpcfg_tls_crlfile(tmp_ctx, lp_ctx);
+        const char *dhpfile = lpcfg_tls_dhpfile(tmp_ctx, lp_ctx);
         void tls_cert_generate(TALLOC_CTX *, const char *, const char *, const char *, const char *);
         params = talloc(mem_ctx, struct tls_params);
@@ -370 +370 @@
         }
 
-        if (!lp_tls_enabled(lp_ctx) || keyfile == NULL || *keyfile == 0) {
+        if (!lpcfg_tls_enabled(lp_ctx) || keyfile == NULL || *keyfile == 0) {
                 params->tls_enabled = false;
                 talloc_free(tmp_ctx);
@@ -378 +378 @@
         if (!file_exist(cafile)) {
                 char *hostname = talloc_asprintf(mem_ctx, "%s.%s",
-                                                 lp_netbios_name(lp_ctx), lp_realm(lp_ctx));
+                                                 lpcfg_netbios_name(lp_ctx),
+                                                 lpcfg_dnsdomain(lp_ctx));
                 if (hostname == NULL) {
                         goto init_failed;