1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
--- nntp.c.orig Sat Jan 25 00:10:39 2003
+++ nntp.c Wed Apr 28 17:47:59 2004
@@ -39,6 +39,7 @@
#include <errno.h>
#include <pwd.h>
#include <ctype.h>
+#include <sys/param.h>
#ifdef NOV
#include "hash.h"
@@ -63,6 +64,7 @@
static int connect_server(void);
static void debug_msg __APROTO((char *prefix, char *str));
static void find_server __APROTO((void));
+char *find_domain __APROTO((char *domainFile));
static int get_server_line __APROTO((char *string, int size));
static int get_server __APROTO((char *string, int size));
static int get_socket __APROTO((void));
@@ -212,6 +214,50 @@
sys_error("Failed to find name of NNTP server!");
}
+
+/*
+ * find_domain Get the domain name for posting from a named file.
+ * Handle blank lines and comments.
+ *
+ * Parameters: "file" is the name of the file to read.
+ *
+ * Returns: Pointer to static data area containing the
+ * first non-blank/comment line in the file.
+ * NULL on error (or lack of entry in file).
+ *
+ * Side effects: None.
+ */
+
+char *
+find_domain(char *domainFile)
+{
+ register FILE *fp;
+ register char *cp;
+ static char buf[MAXHOSTNAMELEN];
+ char *index();
+
+ if (domainFile == NULL)
+ return (NULL);
+
+ fp = fopen(domainFile, "r");
+ if (fp == NULL)
+ return (NULL);
+
+ while (fgets(buf, sizeof (buf), fp) != NULL) {
+ if (*buf == '\n' || *buf == '#')
+ continue;
+ cp = index(buf, '\n');
+ if (cp)
+ *cp = '\0';
+ (void) fclose(fp);
+ return (buf);
+ }
+
+ (void) fclose(fp);
+ return (NULL);
+}
+
+
/*
* get_server_line: get a line from the server.
*
@@ -1415,15 +1461,24 @@
gen_frompath()
{
struct passwd *passwd;
+ char *domain;
+ char *fromFormat = "From: <%s@%s>\r\n";
passwd = getpwuid(getuid());
fprintf(nntp_out, "From: ");
fprintf(nntp_out, "%s ", full_name());
- fprintf(nntp_out, "<%s@%s>\r\n",
- passwd->pw_name,
- domain);
+ domain = find_domain(DOMAIN_FILE);
+ if (domain == NULL) {
+ fprintf(nntp_out, fromFormat,
+ passwd->pw_name,
+ host_name);
+ } else {
+ fprintf(nntp_out, fromFormat,
+ passwd->pw_name,
+ domain);
+ }
#ifdef HIDDENNET
/* Only the login name - nntp server will add uucp name */
|
