diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /net/unix | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/af_unix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index bdd15f744..ae33770fe 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -8,7 +8,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Version: $Id: af_unix.c,v 1.71 1998/10/03 09:39:05 davem Exp $ + * Version: $Id: af_unix.c,v 1.73 1999/01/15 06:55:48 davem Exp $ * * Fixes: * Linus Torvalds : Assorted bug cures. @@ -584,7 +584,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) sk->protinfo.af_unix.addr = addr; - dentry = do_mknod(sunaddr->sun_path, S_IFSOCK|S_IRWXUGO, 0); + dentry = do_mknod(sunaddr->sun_path, S_IFSOCK|sock->inode->i_mode, 0); if (IS_ERR(dentry)) { err = PTR_ERR(dentry); @@ -1536,7 +1536,7 @@ __initfunc(void unix_proto_init(struct net_proto *pro)) struct sk_buff *dummy_skb; struct proc_dir_entry *ent; - printk(KERN_INFO "NET3: Unix domain sockets 0.16 for Linux NET3.038.\n"); + printk(KERN_INFO "NET4: Unix domain sockets 1.0 for Linux NET4.0.\n"); if (sizeof(struct unix_skb_parms) > sizeof(dummy_skb->cb)) { printk(KERN_CRIT "unix_proto_init: panic\n"); |