[CRYPTO] chainiv: Add chain IV generator

[linux-2.6] / kernel / sysctl_check.c

diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
index 6aa4dee79431ba99fa015b3ca9629dca866b6aa7..4abc6d2306f451e8da9141e753b7b517045edda6 100644 (file)
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
@@ -38,7 +38,10 @@ static struct trans_ctl_table trans_kern_table[] = {
        { KERN_NODENAME,                "hostname" },
        { KERN_DOMAINNAME,              "domainname" },
 
+#ifdef CONFIG_SECURITY_CAPABILITIES
        { KERN_CAP_BSET,                "cap-bound" },
+#endif /* def CONFIG_SECURITY_CAPABILITIES */
+
        { KERN_PANIC,                   "panic" },
        { KERN_REALROOTDEV,             "real-root-dev" },
 
@@ -703,6 +706,24 @@ static struct trans_ctl_table trans_net_dccp_table[] = {
        {}
 };
 
+static struct trans_ctl_table trans_net_irda_table[] = {
+       { NET_IRDA_DISCOVERY,           "discovery" },
+       { NET_IRDA_DEVNAME,             "devname" },
+       { NET_IRDA_DEBUG,               "debug" },
+       { NET_IRDA_FAST_POLL,           "fast_poll_increase" },
+       { NET_IRDA_DISCOVERY_SLOTS,     "discovery_slots" },
+       { NET_IRDA_DISCOVERY_TIMEOUT,   "discovery_timeout" },
+       { NET_IRDA_SLOT_TIMEOUT,        "slot_timeout" },
+       { NET_IRDA_MAX_BAUD_RATE,       "max_baud_rate" },
+       { NET_IRDA_MIN_TX_TURN_TIME,    "min_tx_turn_time" },
+       { NET_IRDA_MAX_TX_DATA_SIZE,    "max_tx_data_size" },
+       { NET_IRDA_MAX_TX_WINDOW,       "max_tx_window" },
+       { NET_IRDA_MAX_NOREPLY_TIME,    "max_noreply_time" },
+       { NET_IRDA_WARN_NOREPLY_TIME,   "warn_noreply_time" },
+       { NET_IRDA_LAP_KEEPALIVE_TIME,  "lap_keepalive_time" },
+       {}
+};
+
 static struct trans_ctl_table trans_net_table[] = {
        { NET_CORE,             "core",         trans_net_core_table },
        /* NET_ETHER not used */
@@ -710,20 +731,21 @@ static struct trans_ctl_table trans_net_table[] = {
        { NET_UNIX,             "unix",         trans_net_unix_table },
        { NET_IPV4,             "ipv4",         trans_net_ipv4_table },
        { NET_IPX,              "ipx",          trans_net_ipx_table },
-       { NET_ATALK,            "atalk",        trans_net_atalk_table },
+       { NET_ATALK,            "appletalk",    trans_net_atalk_table },
        { NET_NETROM,           "netrom",       trans_net_netrom_table },
        { NET_AX25,             "ax25",         trans_net_ax25_table },
        { NET_BRIDGE,           "bridge",       trans_net_bridge_table },
        { NET_ROSE,             "rose",         trans_net_rose_table },
        { NET_IPV6,             "ipv6",         trans_net_ipv6_table },
        { NET_X25,              "x25",          trans_net_x25_table },
-       { NET_TR,               "tr",           trans_net_tr_table },
+       { NET_TR,               "token-ring",   trans_net_tr_table },
        { NET_DECNET,           "decnet",       trans_net_decnet_table },
        /*  NET_ECONET not used */
        { NET_SCTP,             "sctp",         trans_net_sctp_table },
        { NET_LLC,              "llc",          trans_net_llc_table },
        { NET_NETFILTER,        "netfilter",    trans_net_netfilter_table },
        { NET_DCCP,             "dccp",         trans_net_dccp_table },
+       { NET_IRDA,             "irda",         trans_net_irda_table },
        { 2089,                 "nf_conntrack_max" },
        {}
 };
@@ -1410,6 +1432,7 @@ static void set_fail(const char **fail, struct ctl_table *table, const char *str
                printk(KERN_ERR "sysctl table check failed: ");
                sysctl_print_path(table);
                printk(" %s\n", *fail);
+               dump_stack();
        }
        *fail = str;
 }
@@ -1513,7 +1536,9 @@ int sysctl_check_table(struct ctl_table *table)
                            (table->strategy == sysctl_ms_jiffies) ||
                            (table->proc_handler == proc_dostring) ||
                            (table->proc_handler == proc_dointvec) ||
+#ifdef CONFIG_SECURITY_CAPABILITIES
                            (table->proc_handler == proc_dointvec_bset) ||
+#endif /* def CONFIG_SECURITY_CAPABILITIES */
                            (table->proc_handler == proc_dointvec_minmax) ||
                            (table->proc_handler == proc_dointvec_jiffies) ||
                            (table->proc_handler == proc_dointvec_userhz_jiffies) ||