[PATCH] ax25: s/suser/capable/

From: Arnaldo Carvalho de Melo (acme@conectiva.com.br)
Date: Sun Aug 27 2000 - 09:31:20 EST


David,

        I forgot these, please consider applying. Comments about the
capabilites used are welcome.

                        - Arnaldo

--- linux-2.4.0-test7/net/ax25/ax25_route.c Mon Jun 26 22:06:55 2000
+++ linux-2.4.0-test7.acme/net/ax25/ax25_route.c Sun Aug 27 11:27:18 2000
@@ -38,6 +38,7 @@
  * Joerg(DL1BKE) Moved BPQ Ethernet driver to separate device.
  * AX.25 035 Frederic(F1OAT) Support for pseudo-digipeating.
  * Jonathan(G4KLX) Support for packet forwarding.
+ * Arnaldo C. Melo s/suser/capable/
  */
 
 #include <linux/config.h>
@@ -363,7 +364,7 @@
                 return -EHOSTUNREACH;
 
         if ((call = ax25_findbyuid(current->euid)) == NULL) {
- if (ax25_uid_policy && !suser())
+ if (ax25_uid_policy && !capable(CAP_NET_BIND_SERVICE))
                         return -EPERM;
                 call = (ax25_address *)ax25->ax25_dev->dev->dev_addr;
         }
--- linux-2.4.0-test7/net/ax25/ax25_uid.c Fri Nov 19 17:33:29 1999
+++ linux-2.4.0-test7.acme/net/ax25/ax25_uid.c Sun Aug 27 11:28:13 2000
@@ -78,7 +78,7 @@
                         return -ENOENT;
 
                 case SIOCAX25ADDUID:
- if (!suser())
+ if (!capable(CAP_NET_ADMIN))
                                 return -EPERM;
                         if (ax25_findbyuid(sax->sax25_uid))
                                 return -EEXIST;
@@ -95,7 +95,7 @@
                         return 0;
 
                 case SIOCAX25DELUID:
- if (!suser())
+ if (!capable(CAP_NET_ADMIN))
                                 return -EPERM;
                         for (ax25_uid = ax25_uid_list; ax25_uid != NULL; ax25_uid = ax25_uid->next) {
                                 if (ax25cmp(&sax->sax25_call, &ax25_uid->call) == 0)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Aug 31 2000 - 21:00:19 EST