summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chpass/chpass.115
-rw-r--r--chpass/edit.c4
-rw-r--r--chpass/table.c2
3 files changed, 13 insertions, 8 deletions
diff --git a/chpass/chpass.1 b/chpass/chpass.1
index 8bcd8c8..6ce3bfa 100644
--- a/chpass/chpass.1
+++ b/chpass/chpass.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)chpass.1 8.2 (Berkeley) 12/30/93
-.\" $Id: chpass.1,v 1.13 1998/12/13 02:48:43 dillon Exp $
+.\" $Id: chpass.1,v 1.14 1998/12/13 15:32:26 bde Exp $
.\"
.Dd December 30, 1993
.Dt CHPASS 1
@@ -96,12 +96,12 @@ password change time
account expiration time
.It Full Name:
user's real name
-.It Location:
-user's normal location (1)
-.It Home Phone:
-user's home phone (1)
+.It Office Location:
+user's office location (1)
.It Office Phone:
user's office phone (1)
+.It Home Phone:
+user's home phone (1)
.It Other Information:
any locally defined parameters for user (1)
.It Home Directory:
@@ -180,6 +180,11 @@ numbers and finally
.Ar other information
which is a single comma delimited string to represent any additional
gcos fields (typically used for site specific user information).
+Note that
+.Xr finger 1
+will display the office location and office phone together under the
+heading
+.Ar Office: .
.Pp
The user's
.Ar home directory
diff --git a/chpass/edit.c b/chpass/edit.c
index 9cae42e..83cd2c8 100644
--- a/chpass/edit.c
+++ b/chpass/edit.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: edit.c,v 1.11 1998/08/14 03:18:32 thepish Exp $
+ * $Id: edit.c,v 1.12 1998/12/06 22:58:14 archie Exp $
*/
#ifndef lint
@@ -149,7 +149,7 @@ display(fd, pw)
if (p)
list[E_LOCATE].save = strdup(p);
if (!list[E_LOCATE].restricted || !uid)
- (void)fprintf(fp, "Location: %s\n", p ? p : "");
+ (void)fprintf(fp, "Office Location: %s\n", p ? p : "");
p = strsep(&bp, ",");
if (p)
diff --git a/chpass/table.c b/chpass/table.c
index 1bc857b..572977f 100644
--- a/chpass/table.c
+++ b/chpass/table.c
@@ -57,7 +57,7 @@ ENTRY list[] = {
#endif
{ "office phone", p_gecos, 0, 12, e2, },
{ "home phone", p_gecos, 0, 10, e2, },
- { "location", p_gecos, 0, 8, e2, },
+ { "office location", p_gecos, 0, 15, e2, },
{ "other information", p_gecos, 0, 11, e1, },
{ "home directory", p_hdir, 1, 14, e1, },
{ "shell", p_shell, 0, 5, e1, },