]>
Commit | Line | Data |
---|---|---|
5c29383d | 1 | diff -ru cfingerd-1.4.3.gpg/cfingerd.conf cfingerd-1.4.3/cfingerd.conf |
2 | --- cfingerd-1.4.3.gpg/cfingerd.conf Fri Jul 30 10:18:32 1999 | |
3 | +++ cfingerd-1.4.3/cfingerd.conf Sat Jan 15 19:59:18 2000 | |
4 | @@ -16,6 +16,7 @@ | |
5 | FILES display_files = { | |
6 | PLAN = ".plan", | |
7 | PROJECT = ".project", | |
8 | + GPG_KEY = ".gpgkey", | |
9 | PGP_KEY = ".pgpkey", | |
10 | XFACE = ".xface", | |
11 | NO_FINGER = ".nofinger", | |
12 | @@ -54,6 +55,7 @@ | |
13 | +PLAN = [TRUE, TRUE], | |
14 | +PROJECT = [TRUE, TRUE], | |
15 | +PGP = [TRUE, TRUE], | |
16 | + +GPG = [TRUE, TRUE], | |
17 | +XFACE = [TRUE, TRUE], | |
18 | -NO_NAME_BANNER = [TRUE, TRUE], | |
19 | -REJECTED_BANNER = [TRUE, TRUE], | |
20 | @@ -131,9 +133,11 @@ | |
21 | PLAN = "Plan:", | |
22 | PROJECT = "Project:", | |
23 | PGPKEY = "PGP Public Key:", | |
24 | + GPGKEY = "GPG Public Key:", | |
25 | NO_PLAN = "This user has no plan.", | |
26 | NO_PROJECT = "This user has no project.", | |
27 | NO_PGP = "This user has no PGP public key.", | |
28 | + NO_GPG = "This user has no GPG public key.", | |
29 | WAIT = "Gathering system data...", | |
30 | XFACE = "XFace:", | |
31 | NO_XFACE = "This user has no xface file." | |
32 | diff -ru cfingerd-1.4.3.gpg/docs/cfingerd.8 cfingerd-1.4.3/docs/cfingerd.8 | |
33 | --- cfingerd-1.4.3.gpg/docs/cfingerd.8 Sun Sep 5 00:39:28 1999 | |
34 | +++ cfingerd-1.4.3/docs/cfingerd.8 Sat Jan 15 19:59:18 2000 | |
35 | @@ -156,8 +156,8 @@ | |
36 | of a user's name or username, chances are, it'll be displayed. | |
37 | .PP | |
38 | .B Not just PLAN, or PROJECT | |
39 | -but there's also an option to display your public PGP key, if you have | |
40 | -one. This is very useful if you want to keep your mail or other | |
41 | +but there's also an option to display your public PGP and/or GPG key, if you have | |
42 | +that ones. This is very useful if you want to keep your mail or other | |
43 | information secret to yourself, and don't want "big brother" watching | |
44 | over your shoulder as you talk amongst yourselves. (Thanks to Andy Smith | |
45 | for this patch). (For your info, the standard plan file is | |
46 | @@ -166,6 +166,8 @@ | |
47 | .IR .project , | |
48 | PGP info is | |
49 | .IR .pgpkey , | |
50 | +GPG info is | |
51 | +.IR .gpgkey , | |
52 | and XFace icon information is | |
53 | .IR .xface ) | |
54 | .PP | |
55 | diff -ru cfingerd-1.4.3.gpg/docs/cfingerd.conf.5 cfingerd-1.4.3/docs/cfingerd.conf.5 | |
56 | --- cfingerd-1.4.3.gpg/docs/cfingerd.conf.5 Sun Sep 5 00:39:28 1999 | |
57 | +++ cfingerd-1.4.3/docs/cfingerd.conf.5 Sat Jan 15 19:59:18 2000 | |
58 | @@ -74,6 +74,11 @@ | |
59 | displaying a public or private key. The standard here is | |
60 | .IR ".pgpkey" . | |
61 | .PP | |
62 | +.B GPG_KEY | |
63 | +is the optional "GNU Privacy Guard" file that is shown when | |
64 | +displayin a public or private key. The standard here is | |
65 | +.IR ".gpgkey" . | |
66 | +.PP | |
67 | .B XFACE | |
68 | is the optional file that shows the user's face. (This is commonly | |
69 | used in E-Mail messages.) The standard here is | |
70 | @@ -231,6 +236,9 @@ | |
71 | .B PGP | |
72 | displays the user's Pretty\-Good\-Privacy key file. | |
73 | .PP | |
74 | +.B GPG | |
75 | +displays the user's GNU Privacy Guard key file. | |
76 | +.PP | |
77 | .B XFACE | |
78 | displays the user's XFACE file. | |
79 | .PP | |
80 | @@ -497,6 +505,9 @@ | |
81 | .B PGPKEY | |
82 | is the string that is displayed when the user's PGP Key is shown. | |
83 | .PP | |
84 | +.B GPGKEY | |
85 | +is the string that is displayed when the user's GPG Key is shown. | |
86 | +.PP | |
87 | .B XFACE | |
88 | is the string that is displayed when the user's XFACE file is shown. | |
89 | .PP | |
90 | @@ -517,6 +528,12 @@ | |
91 | to show you and | |
92 | .B ONLY_SHOW_HEADERS_IF_FILE_EXISTS | |
93 | is not enabled. | |
94 | +.PP | |
95 | +.B NO_GPG | |
96 | +is the string that is displayed if the user doesn't have a GPG Key file | |
97 | +to show you and | |
98 | +.B ONLY_SHOW_HEADERS_IF_FILE_EXISTS | |
99 | +is not enbaled. | |
100 | .PP | |
101 | .B NO_XFACE | |
102 | is the string that is displayed if the user doesn't have an xface file | |
103 | diff -ru cfingerd-1.4.3.gpg/src/cfingerd.h cfingerd-1.4.3/src/cfingerd.h | |
104 | --- cfingerd-1.4.3.gpg/src/cfingerd.h Sun Aug 29 10:58:29 1999 | |
105 | +++ cfingerd-1.4.3/src/cfingerd.h Sat Jan 15 19:59:18 2000 | |
106 | @@ -110,6 +110,7 @@ | |
107 | #define SHOW_FINGERFWD 0x2000 /* Allow for forwardable fingers */ | |
108 | #define SHOW_ULISTONLY 0x4000 /* Allow for "userlist-only" fingers */ | |
109 | #define SHOW_NOBODY1413 0x8000 /* Allow for non-ident users to finger */ | |
110 | +#define SHOW_GPGKEY 0x10000 /* Show the user's GPG key file */ | |
111 | ||
112 | /* Third row of configuration bits -- ALWAYS room for improvement */ | |
113 | #define SHOW_LOG 0x0001 /* Allow for logging of all fingers */ | |
114 | @@ -160,6 +161,8 @@ | |
115 | #define D_IDENT_CONREF 28 /* Connection refused for RFC1413 report*/ | |
116 | #define D_IDENT_ILLEGAL 29 /* Illegal data in RFC1413 report */ | |
117 | #define D_IDENT_TIMEOUT 30 /* RFC1413 report timed out */ | |
118 | +#define D_GPGKEY 31 /* GPG key display string */ | |
119 | +#define D_NO_GPGKEY 32 /* NO GPG key display string */ | |
120 | ||
121 | /* General program errors */ | |
122 | #define E_STANDALONE 1 /* Cannot run in standalone mode */ | |
123 | @@ -238,6 +241,7 @@ | |
124 | char *plan_file; /* The generic plan file to use */ | |
125 | char *project_file; /* The generic project file to use */ | |
126 | char *pgpkey_file; /* The generic PGP file to use */ | |
127 | + char *gpgkey_file; /* The generic GPG file to use */ | |
128 | char *xface_file; /* The generic XFACE file to use */ | |
129 | char *log_file; /* The generic log file to use */ | |
130 | char *userlog_file; /* The generic user log file to use */ | |
131 | diff -ru cfingerd-1.4.3.gpg/src/configure.c cfingerd-1.4.3/src/configure.c | |
132 | --- cfingerd-1.4.3.gpg/src/configure.c Thu Aug 12 16:16:09 1999 | |
133 | +++ cfingerd-1.4.3/src/configure.c Sat Jan 15 19:59:18 2000 | |
134 | @@ -60,6 +60,7 @@ | |
135 | { "PLAN", SHOW_PLAN, 2 }, | |
136 | { "PROJECT", SHOW_PROJECT, 2 }, | |
137 | { "PGP", SHOW_PGPKEY, 2 }, | |
138 | + { "GPG", SHOW_GPGKEY, 2 }, | |
139 | { "NO_NAME_BANNER", SHOW_NN_BANNER, 2 }, | |
140 | { "REJECTED_BANNER", SHOW_REJECTED, 2 }, | |
141 | { "SYSTEM_LIST", SHOW_SYSTEMLIST, 2 }, | |
142 | @@ -105,6 +106,8 @@ | |
143 | { "NO_PROJECT", D_NO_PROJECT, 0 }, | |
144 | { "NO_PGP", D_NO_PGPKEY, 0 }, | |
145 | { "PGPKEY", D_PGPKEY, 0 }, | |
146 | + { "NO_GPG", D_NO_GPGKEY, 0}, | |
147 | + { "GPGKEY", D_GPGKEY, 0}, | |
148 | { "WAIT", D_WAIT, 0 }, | |
149 | { "XFACE", D_XFACE, 0 }, | |
150 | { "NO_XFACE", D_NO_XFACE, 0 }, | |
151 | @@ -210,6 +213,8 @@ | |
152 | strmcpy(&prog_config.project_file, (char *) filename); | |
153 | else if (!(strncasecmp(element, "PGP_KEY", 7))) | |
154 | strmcpy(&prog_config.pgpkey_file, (char *) filename); | |
155 | + else if (!(strncasecmp(element, "GPG_KEY", 7))) | |
156 | + strmcpy(&prog_config.gpgkey_file, (char *) filename); | |
157 | else if (!(strncasecmp(element, "XFACE", 5))) | |
158 | strmcpy(&prog_config.xface_file, (char *) filename); | |
159 | else if (!(strncasecmp(element, "NO_FINGER", 9))) | |
160 | diff -ru cfingerd-1.4.3.gpg/src/standard.c cfingerd-1.4.3/src/standard.c | |
161 | --- cfingerd-1.4.3.gpg/src/standard.c Wed Sep 29 09:04:24 1999 | |
162 | +++ cfingerd-1.4.3/src/standard.c Sat Jan 15 19:59:18 2000 | |
163 | @@ -957,6 +957,10 @@ | |
164 | prog_config.pgpkey_file, | |
165 | (prog_config.config_bits2 & SHOW_STRICTFMT) ? FALSE : TRUE); | |
166 | ||
167 | + show_pfile(nuid, ngid, SHOW_GPGKEY, D_GPGKEY, D_NO_GPGKEY, pwent->pw_dir, | |
168 | + prog_config.gpgkey_file, | |
169 | + (prog_config.config_bits2 & SHOW_STRICTFMT) ? FALSE : TRUE); | |
170 | + | |
171 | show_pfile2(nuid, ngid, SHOW_XFACE, D_XFACE, D_NO_XFACE, pwent->pw_dir, | |
172 | prog_config.xface_file, FALSE); | |
173 | } | |
174 | Only in cfingerd-1.4.3/src: standard.c~ | |
175 | diff -ru cfingerd-1.4.3.gpg/src/util.c cfingerd-1.4.3/src/util.c | |
176 | --- cfingerd-1.4.3.gpg/src/util.c Wed Sep 29 09:04:24 1999 | |
177 | +++ cfingerd-1.4.3/src/util.c Sat Jan 15 19:59:18 2000 | |
178 | @@ -37,6 +37,7 @@ | |
179 | prog_config.plan_file = NULL; | |
180 | prog_config.project_file = NULL; | |
181 | prog_config.pgpkey_file = NULL; | |
182 | + prog_config.gpgkey_file = NULL; | |
183 | prog_config.xface_file = NULL; | |
184 | prog_config.userlog_file = NULL; | |
185 | prog_config.mailbox_file = NULL; |