Changeset 5685

Timestamp:

02/24/10 21:37:16 (3 years ago)

Author:

blogic

Message:

use proper uci packages

Location:

luci2/cbi2

Files:

• luci.uci (modified) (1 diff)
• session.c (modified) (7 diffs)

luci2/cbi2/luci.uci

@@ -1 +1 @@
 config luci luci
     option root /lib/luci2/
-    option socket /tmp/luci2-socket23
+    option socket /tmp/luci2-socket
     option lang en
+
+config user user
+#   option  'admin' 'admin'
+    option  'admin' '$1$5CpqkCO0$P9BNVRqNTajfArljexEG40'
+
+config session session

luci2/cbi2/session.c

@@ -41 +41 @@
             session[i] += 'A' - 36;
     }
-    ctx = ucix_init(cbictx, "zepttho", 1);
-    ucix_add_option_int(ctx, "zepttho", "session", session, time(0));
-    ucix_save(ctx, "zepttho");
+    ctx = ucix_init(cbictx, "luci", 1);
+    ucix_add_option_int(ctx, "luci", "session", session, time(0));
+    ucix_save(ctx, "luci");
     ucix_cleanup(ctx);
     return session;
@@ -54 +54 @@
     if((t > 0) && ((time(0) - t) > session_timeout))
     {
-        ucix_revert(ctx, "zepttho", "session", key);
+        ucix_revert(ctx, "luci", "session", key);
         t = 0;
     }
@@ -62 +62 @@
 {
     struct uci_context *ctx;
-    ctx = ucix_init(cbictx, "zepttho", 1);
+    ctx = ucix_init(cbictx, "luci", 1);
     uci_set_savedir(ctx, "/var/state/");
-    ucix_for_each_section_option(ctx, "zepttho", "session", session_expire_cb, ctx);
-    ucix_save(ctx, "zepttho");
+    ucix_for_each_section_option(ctx, "luci", "session", session_expire_cb, ctx);
+    ucix_save(ctx, "luci");
     ucix_cleanup(ctx);
 }
@@ -76 +76 @@
     if(!auth)
         goto out;
-    ctx = ucix_init(cbictx, "zepttho", 1);
+    ctx = ucix_init(cbictx, "luci", 1);
     uci_set_savedir(ctx, "/var/state/");
-    t = ucix_get_option_int(ctx, "zepttho", "session", auth, 0);
+    t = ucix_get_option_int(ctx, "luci", "session", auth, 0);
     if(t)
     {
-        ucix_revert(ctx, "zepttho", "session", auth);
-        ucix_add_option_int(ctx, "zepttho", "session", auth, time(0));
-        ucix_save(ctx, "zepttho");
+        ucix_revert(ctx, "luci", "session", auth);
+        ucix_add_option_int(ctx, "luci", "session", auth, time(0));
+        ucix_save(ctx, "luci");
     }
     ucix_cleanup(ctx);
@@ -100 +100 @@
     if(!sauth)
         goto out;
-    ctx = ucix_init(cbictx, "zepttho", 1);
+    ctx = ucix_init(cbictx, "luci", 1);
     uci_set_savedir(ctx, "/var/state/");
-    t = ucix_get_option_int(ctx, "zepttho", "session", sauth, 0);
+    t = ucix_get_option_int(ctx, "luci", "session", sauth, 0);
     if(t)
     {
         printf("logoff session %s\n", sauth);
-        ucix_revert(ctx, "zepttho", "session", sauth);
-        ucix_save(ctx, "zepttho");
+        ucix_revert(ctx, "luci", "session", sauth);
+        ucix_save(ctx, "luci");
     }
     ucix_cleanup(ctx);
@@ -123 +123 @@
     if(!pass)
         return ret;
-    ctx = ucix_init(cbictx, "user", 0);
-    passwd = ucix_get_option(ctx, "user", "user", "admin");
+    ctx = ucix_init(cbictx, "luci", 0);
+    passwd = ucix_get_option(ctx, "luci", "user", "admin");
     ucix_cleanup(ctx);
     if(passwd)
@@ -148 +148 @@
         close(fd);
         sprintf(salt, "$1$%02X$", buf);
-        ucictx = ucix_init(cbictx, "user", 1);
-        ucix_add_option(ucictx, "user", "user", "admin", crypt(passwd1, salt));
-        ucix_commit(ucictx, "user");
+        ucictx = ucix_init(cbictx, "luci", 1);
+        ucix_add_option(ucictx, "luci", "user", "admin", crypt(passwd1, salt));
+        ucix_commit(ucictx, "luci");
         ucix_cleanup(ucictx);
         return 0;