#! /bin/sh /usr/share/dpatch/dpatch-run
## 90_setgid_spamc.dpatch by dean gaudet <dean@arctic.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad spamassassin-3.0.1/spamc/libspamc.c /home/dean/tmp/dpep.FBgTYQ/spamassassin-3.0.1/spamc/libspamc.c
--- spamassassin-3.0.1/spamc/libspamc.c	2004-10-22 18:39:18.000000000 -0700
+++ /home/dean/tmp/dpep.FBgTYQ/spamassassin-3.0.1/spamc/libspamc.c	2004-10-26 17:01:17.000000000 -0700
@@ -1124,8 +1124,13 @@
 
     memset(tp, 0, sizeof *tp);
 
+#if 0
     tp->type = TRANSPORT_LOCALHOST;
     tp->port = 783;
+#else
+    tp->type       = TRANSPORT_UNIX;
+    tp->socketpath = "/var/run/spamd/sock";
+#endif
     tp->flags = 0;
 }
 
diff -urNad spamassassin-3.0.1/spamc/spamc.c /home/dean/tmp/dpep.FBgTYQ/spamassassin-3.0.1/spamc/spamc.c
--- spamassassin-3.0.1/spamc/spamc.c	2004-10-22 18:39:18.000000000 -0700
+++ /home/dean/tmp/dpep.FBgTYQ/spamassassin-3.0.1/spamc/spamc.c	2004-10-26 17:01:17.000000000 -0700
@@ -277,6 +277,10 @@
             }
             case 'u':
             {
+		if (getuid() && getgid() != getegid()) {
+		    printf("you are running setgid, and -u is permitted only when root\n");
+		    ret = EX_USAGE;
+		}
                 *username = optarg;
                 break;
             }