ITS#2764, #2781 revert backend.c patch, just catch the NULL referral

[openldap] / servers / slapd / back-dnssrv / config.c

diff --git a/servers/slapd/back-dnssrv/config.c b/servers/slapd/back-dnssrv/config.c
index 98985f173c8f4f950716ac726e47fba70b2538b9..7a6cb3318da7c845d9cef4025e0e6a638cbe0be4 100644 (file)
--- a/servers/slapd/back-dnssrv/config.c
+++ b/servers/slapd/back-dnssrv/config.c
@@ -1,8 +1,22 @@
 /* config.c - DNS SRV backend configuration file routine */
 /* $OpenLDAP$ */
-/*
- * Copyright 2000-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2003 The OpenLDAP Foundation.
+ * Portions Copyright 2000-2003 Kurt D. Zeilenga.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by Kurt D. Zeilenga for inclusion
+ * in OpenLDAP Software.
  */
 
 #include "portable.h"
@@ -13,7 +27,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "back-dnssrv.h"
+#include "external.h"
 
 int
 dnssrv_back_db_config(
@@ -21,11 +35,9 @@ dnssrv_back_db_config(
     const char *fname,
     int                lineno,
     int                argc,
-    char       **argv
-)
+    char       **argv )
 {
        struct ldapinfo *li = (struct ldapinfo *) be->be_private;
-       char *port;
 
        if ( li == NULL ) {
                fprintf( stderr, "%s: line %d: DNSSRV backend info is null!\n",
@@ -36,7 +48,8 @@ dnssrv_back_db_config(
        /* no configuration options (yet) */
        {
                fprintf( stderr,
-"%s: line %d: unknown directive \"%s\" in DNSSRV database definition (ignored)\n",
+                       "%s: line %d: unknown directive \"%s\""
+                       " in DNSSRV database definition (ignored)\n",
                    fname, lineno, argv[0] );
        }
        return 0;