r7231: remove some old stuff

(This used to be commit 2e3316be9faf696fbb84e0a183de47418d7b9acd)

diff --git a/source4/web_server/calls.c b/source4/web_server/calls.c
deleted file mode 100644 (file)
index 8e9ea86..0000000
--- a/source4/web_server/calls.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide hooks into C calls from esp scripts
-
-   Copyright (C) Andrew Tridgell 2005
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-#include "pwd.h"
-#include "web_server/esp/esp.h"
-#include "param/loadparm.h"
-#include "lib/ldb/include/ldb.h"
-
-
-/* try to authenticate the user/password pair against system auth mechanisms
-   returns 0 on success
-   returns -1 on error
-
-   fills in the session structure properly in case of success
-   NOTE: Currently only PAM Auth is supported
-*/
-
-static int esp_unixAuth(struct EspRequest *ep, int argc, struct MprVar **argv)
-{
-       TALLOC_CTX *tmp_ctx = talloc_new(ep);
-       const char *username;
-       const char *password;
-       struct passwd *pwd;
-       int ret;
-
-       if (argc != 2 || argv[0]->type != MPR_TYPE_STRING ||
-                       argv[1]->type != MPR_TYPE_STRING) {
-               espError(ep, "unixAuth invalid arguments");
-               ret = -1;
-               goto done;
-       }
-
-       username = mprToString(argv[0]);
-       password = mprToString(argv[1]);
-
-       if (username == NULL || password == NULL) {
-               espError(ep, "unixAuth invalid arguments");
-               ret = -1;
-               goto done;
-       }
-
-       /* TODO: find out how to pass the real client name/address here */
-       if (NT_STATUS_IS_OK(unix_passcheck(tmp_ctx, "client", username, password))) {
-
-               pwd = getpwnam(username);
-               if (!pwd) {
-                       espSetReturn(ep, mprCreateIntegerVar(-1));
-                       ret = -1;
-                       goto done;
-               }
-
-               mprSetPropertyValue(&ep->variables[ESP_SESSION_OBJ],
-                                       "AUTHENTICATED", mprCreateStringVar("1", 0));
-               mprSetPropertyValue(&ep->variables[ESP_SESSION_OBJ],
-                                       "USERNAME", mprCreateStringVar(username, 0));
-
-               if (pwd->pw_uid == 0) { /* we are root */
-
-                       mprSetPropertyValue(&ep->variables[ESP_SESSION_OBJ],
-                                       "PRIVILEGE", mprCreateStringVar("ADMIN", 0));
-               } else {
-                       mprSetPropertyValue(&ep->variables[ESP_SESSION_OBJ],
-                                       "PRIVILEGE", mprCreateStringVar("USER", 0));
-               }
-
-               espSetReturn(ep, mprCreateIntegerVar(0));
-       } else {
-               if (mprGetProperty(&ep->variables[ESP_SESSION_OBJ], "AUTHENTICATED", 0) != 0) {
-                       mprDeleteProperty(&ep->variables[ESP_SESSION_OBJ], "AUTHENTICATED");
-               }
-               espSetReturn(ep, mprCreateIntegerVar(-1));
-       }
-
-done:
-       talloc_free(tmp_ctx);
-       return ret;
-}
-
-/*
-  setup the C functions that be called from ejs
-*/
-void http_setup_ejs_functions(void)
-{
-       espDefineCFunction(NULL, "unixAuth", esp_unixAuth, NULL);
-}

diff --git a/swat/esptest/auth.esp b/swat/esptest/auth.esp
deleted file mode 100644 (file)
index 35953dc..0000000
--- a/swat/esptest/auth.esp
+++ /dev/null
@@ -1,48 +0,0 @@
-<% page_header("columns", "ESP Authentication Test"); %>
-
-<h1>Samba4 unixAuth test</h1>
-
-<form name="AuthTest" method="POST" action="@@request['SCRIPT_NAME']"> 
-    <input name="submit" type="submit" value="Logout">
-    <input name="submit" type="submit" value="Cancel"><br>
-    <br>
-    Username:   <input name="Username"  type="text" value=""><br>
-    Password:  <input name="Password" type="password" value=""><br>
-    <br>
-    <input name="submit" type="submit" value="Login"><br>
-</form>
-
-<%
-  /* if its a post then the user has filled in the form, so
-     report the values 
-  */
-if (request['REQUEST_METHOD'] == "POST") {
-       /* if they cancelled then take them back to the list of tests */
-       if (form['submit'] == "Cancel") {
-               redirect("/");
-       }
-       
-       username  = form['Username'];
-       password = form['Password'];
-       
-       if (form['submit'] == "Logout") {
-               res = unixAuth("logout", "logout");
-       }
-       
-       if (form['submit'] == "Login") {
-               res = unixAuth(username, password);
-               if (res != 0) {
-                       write ("<br>Unsuccessful authentication\n");
-               } else {
-                       write ("<br>Successfully authenticated\n");
-               }
-       }
-}
-
-write ("<br>AUTHENTICATED = " + session['AUTHENTICATED'] + "\n");
-write ("<br>USERNAME = " + session['USERNAME'] + "\n");
-write ("<br>PRIVILEGE = " + session['PRIVILEGE'] + "\n");
-
-%>
-
-<% page_footer(); %>