remove couchpw, we don't need it.

git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@724891 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 0 insertions, 189 deletions

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 2d685e42..e03dfa0d 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -13,11 +13,6 @@
 bin_SCRIPTS = couchdb couchjs
 noinst_SCRIPTS = couchjs_dev
 
-bin_PROGRAMS = couchpw
-couchpw_SOURCES = couchpw.c
-
-couchpw_LDADD = $(LIBS)
-
 if HELP2MAN
 dist_man1_MANS = couchdb.1 couchjs.1
 endif
diff --git a/bin/couchpw.c b/bin/couchpw.c
deleted file mode 100644
index a328c725..00000000
--- a/bin/couchpw.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Original work:
- * htpasswd.c: simple program for manipulating password file for NCSA httpd.
- * Rob McCool
- * Adapted for Apache CouchDB by Jan Lehnardt <jan@apache.org>. 
- */
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/signal.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-
-#define LF 10
-#define CR 13
-
-#define MAX_STRING_LEN 256
-
-char *tn;
-
-char *strd(char *s) {
-    char *d;
-
-    d=(char *)malloc(strlen(s) + 1);
-    strcpy(d,s);
-    return(d);
-}
-
-void getword(char *word, char *line, char stop) {
-    int x = 0,y;
-
-    for(x=0;((line[x]) && (line[x] != stop));x++)
-        word[x] = line[x];
-
-    word[x] = '\0';
-    if(line[x]) ++x;
-    y=0;
-
-    while((line[y++] = line[x++]));
-}
-
-int getline(char *s, int n, FILE *f) {
-    register int i=0;
-
-    while(1) {
-        s[i] = (char)fgetc(f);
-
-        if(s[i] == CR)
-            s[i] = fgetc(f);
-
-        if((s[i] == 0x4) || (s[i] == LF) || (i == (n-1))) {
-            s[i] = '\0';
-            return (feof(f) ? 1 : 0);
-        }
-        ++i;
-    }
-}
-
-void putline(FILE *f,char *l) {
-    int x;
-
-    for(x=0;l[x];x++) fputc(l[x],f);
-    fputc('\n',f);
-}
-
-
-/* From local_passwd.c (C) Regents of Univ. of California blah blah */
-static unsigned char itoa64[] =         /* 0 ... 63 => ascii - 64 */
-        "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-void to64(s, v, n)
-  register char *s;
-  register long v;
-  register int n;
-{
-    while (--n >= 0) {
-        *s++ = itoa64[v&0x3f];
-        v >>= 6;
-    }
-}
-
-// char *crypt(char *pw, char *salt); /* why aren't these prototyped in include */
-// char *getpass(char *prompt);
-
-void add_password(char *user, FILE *f) {
-    char *pw, *cpw, salt[3];
-
-    pw = strd(getpass("New password:"));
-    if(strcmp(pw,getpass("Re-type new password:"))) {
-        fprintf(stderr,"They don't match, sorry.\n");
-        if(tn)
-            unlink(tn);
-        exit(1);
-    }
-    (void)srand((int)time((time_t *)NULL));
-    to64(&salt[0],rand(),2);
-    cpw = crypt(pw,salt);
-    free(pw);
-    fprintf(f,"%s:%s\n",user,cpw);
-}
-
-void usage() {
-    fprintf(stderr,"Usage: couchpw [-c] passwordfile username\n");
-    fprintf(stderr,"The -c flag creates a new file.\n");
-    exit(1);
-}
-
-void interrupted() {
-    fprintf(stderr,"Interrupted.\n");
-    if(tn) unlink(tn);
-    exit(1);
-}
-
-int main(int argc, char *argv[]) {
-    FILE *tfp,*f;
-    char user[MAX_STRING_LEN];
-    char line[MAX_STRING_LEN];
-    char l[MAX_STRING_LEN];
-    char w[MAX_STRING_LEN];
-    char command[MAX_STRING_LEN];
-    int found;
-
-    tn = NULL;
-    signal(SIGINT,(void (*)())interrupted);
-    if(argc == 4) {
-        if(strcmp(argv[1],"-c"))
-            usage();
-        if(!(tfp = fopen(argv[2],"w"))) {
-            fprintf(stderr,"Could not open passwd file %s for writing.\n",
-                    argv[2]);
-            perror("fopen");
-            exit(1);
-        }
-        printf("Adding password for %s.\n",argv[3]);
-        add_password(argv[3],tfp);
-        fclose(tfp);
-        exit(0);
-    } else if(argc != 3) usage();
-
-    tn = tmpnam(NULL);
-    if(!(tfp = fopen(tn,"w"))) {
-        fprintf(stderr,"Could not open temp file.\n");
-        exit(1);
-    }
-
-    if(!(f = fopen(argv[1],"r"))) {
-        fprintf(stderr,
-                "Could not open passwd file %s for reading.\n",argv[1]);
-        fprintf(stderr,"Use -c option to create new one.\n");
-        exit(1);
-    }
-    strcpy(user,argv[2]);
-
-    found = 0;
-    while(!(getline(line,MAX_STRING_LEN,f))) {
-        if(found || (line[0] == '#') || (!line[0])) {
-            putline(tfp,line);
-            continue;
-        }
-        strcpy(l,line);
-        getword(w,l,':');
-        if(strcmp(user,w)) {
-            putline(tfp,line);
-            continue;
-        }
-        else {
-            printf("Changing password for user %s\n",user);
-            add_password(user,tfp);
-            found = 1;
-        }
-    }
-    if(!found) {
-        printf("Adding user %s\n",user);
-        add_password(user,tfp);
-    }
-    fclose(f);
-    fclose(tfp);
-    sprintf(command,"cp %s %s",tn,argv[1]);
-    system(command);
-    unlink(tn);
-	exit(0);
-}