Merge branch 'master' into next

[paraslash.git] / attribute.c

diff --git a/attribute.c b/attribute.c
index 41a10058d9358463713006aaf6c4b9257375e587..cfb7dde0d0c1bc83160f6698bbe304d27007444b 100644 (file)
--- a/attribute.c
+++ b/attribute.c
@@ -6,6 +6,7 @@
 
 /** \file attribute.c Attribute handling functions. */
 
 
 /** \file attribute.c Attribute handling functions. */
 

+#include <regex.h>

 #include <openssl/rc4.h>
 #include <osl.h>
 
 #include <openssl/rc4.h>
 #include <osl.h>
 


@@ -609,7 +610,6 @@ static int attribute_create(const char *dir)
  */
 void attribute_init(struct afs_table *t)
 {
  */
 void attribute_init(struct afs_table *t)
 {

-       t->name = attribute_table_desc.name;

        t->open = attribute_open;
        t->close = attribute_close;
        t->create = attribute_create;
        t->open = attribute_open;
        t->close = attribute_close;
        t->create = attribute_create;