Ticket #274: discuss-nokerberos.diff

libds/Makefile.in

@@ -60 +60 @@
         mv res_module.o res_module.k.o
 
 res_module.nk.o: res_module.c
-        ${CC} ${ALL_CFLAGS} -c res_module.c
+        ${CC} ${ALL_CFLAGS} -DNOKERBEROS -c res_module.c
         mv res_module.o res_module.nk.o
 
 auth_krb.o:
@@ -71 +71 @@
         mv rpcall.o rpcall.k.o
 
 rpcall.nk.o:
-        ${CC} ${ALL_CFLAGS} -c rpcall.c
+        ${CC} ${ALL_CFLAGS} -DNOKERBEROS -c rpcall.c
         mv rpcall.o rpcall.nk.o
 

libds/res_module.c

@@ -33 +33 @@
 #include <string.h>
 #include <ctype.h>
 
+#ifdef NOKERBEROS
+#undef HAVE_KRB4
+#undef HAVE_KRB5
+#endif /* NOKERBEROS */
+
 #ifdef HAVE_KRB4
 #include <krb.h>
 #ifndef MAX_K_NAME_SZ
@@ -289 +294 @@
 
     retval = krb5_init_context(&context);
     if (!retval)
-      krb5_get_host_realm(context, primary_name, &hrealms);
-    if (!retval && !hrealms[0])
+      retval = krb5_get_host_realm(context, primary_name, &hrealms);
+    if (!retval && hrealms && hrealms[0] && *(hrealms[0]))
       strcpy(krb_realm, hrealms[0]);
-    if (retval)
+    else
       strcpy(krb_realm, local_realm());
 
     if (hrealms)

libds/rpcall.c

@@ -38 +38 @@
 #include <discuss/tfile.h>
 #include "rpc.h"
 #include "config.h"
+
+#ifdef NOKERBEROS
+#undef HAVE_KRB4
+#undef HAVE_KRB5
+#endif /* NOKERBEROS */
+
 #ifdef HAVE_KRB5
 #include "krb5.h"
 #endif /* HAVE_KRB5 */

mclient/Makefile.in

@@ -61 +61 @@
         ${CC} ${LDFLAGS} -o pmtg pmtg.o ../ets/dsc_et.o ${KLIBS}
 
 dsmail: dsmail.o ../ets/dsc_et.o
-        ${CC} ${LDFLAGS} -o dsmail dsmail.o ../ets/dsc_et.o ${KLIBS}
+        ${CC} ${LDFLAGS} -o dsmail dsmail.o ../ets/dsc_et.o ${NKLIBS}
 
 dspipe: dspipe.o ../ets/dsc_et.o
         ${CC} ${LDFLAGS} -o dspipe dspipe.o ../ets/dsc_et.o ${KLIBS}

server/Makefile.in

@@ -78 +78 @@
         mv rpproc.o rpproc.k.o
 
 rpproc.nk.o: rpproc.c
-        ${CC} ${ALL_CFLAGS} -DSUBPROC -c rpproc.c
+        ${CC} ${ALL_CFLAGS} -DSUBPROC -DNOKERBEROS -c rpproc.c
         mv rpproc.o rpproc.nk.o
 
 rpproc.debug.o: rpproc.c

server/rpproc.c

@@ -20 +20 @@
  */
 
 
+#ifdef NOKERBEROS
+#undef HAVE_KRB4
+#undef HAVE_KRB5
+#endif /* NOKERBEROS */
+
 #ifdef INETD
 #define ASSOC 1
 #endif