X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fnet%2Fscm.h;h=06df126103cab8224d6cf7ae64c7f00e75f06e12;hb=ee5c2ab09b79d3aba3515a3eae7c5cf1e2cbc569;hp=5637d5e22d5ff76012daf46ba30e04546d24a5bd;hpb=20dbfad8e5dfea56b3cb0cfd4465f01c37b57aa6;p=linux-2.6

diff --git a/include/net/scm.h b/include/net/scm.h
index 5637d5e22d..06df126103 100644
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -4,11 +4,13 @@
 #include <linux/limits.h>
 #include <linux/net.h>
 #include <linux/security.h>
+#include <linux/pid.h>
+#include <linux/nsproxy.h>
 
 /* Well, we should have at least one descriptor open
  * to accept passed FDs 8)
  */
-#define SCM_MAX_FD	(OPEN_MAX-1)
+#define SCM_MAX_FD	255
 
 struct scm_fp_list
 {
@@ -54,7 +56,7 @@ static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,
 	struct task_struct *p = current;
 	scm->creds.uid = p->uid;
 	scm->creds.gid = p->gid;
-	scm->creds.pid = p->tgid;
+	scm->creds.pid = task_tgid_vnr(p);
 	scm->fp = NULL;
 	scm->seq = 0;
 	unix_get_peersec_dgram(sock, scm);