Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 49835 invoked from network); 20 May 2009 18:08:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 May 2009 18:08:40 -0000 Received: (qmail 42541 invoked by uid 500); 20 May 2009 18:08:53 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 42513 invoked by uid 500); 20 May 2009 18:08:53 -0000 Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zookeeper-dev@ Delivered-To: mailing list zookeeper-commits@hadoop.apache.org Received: (qmail 42503 invoked by uid 99); 20 May 2009 18:08:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 May 2009 18:08:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 May 2009 18:08:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0077A2388897; Wed, 20 May 2009 18:08:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r776793 - in /hadoop/zookeeper/trunk: CHANGES.txt src/c/src/cli.c src/java/main/org/apache/zookeeper/ZooKeeperMain.java Date: Wed, 20 May 2009 18:08:28 -0000 To: zookeeper-commits@hadoop.apache.org From: breed@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090520180829.0077A2388897@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: breed Date: Wed May 20 18:08:28 2009 New Revision: 776793 URL: http://svn.apache.org/viewvc?rev=776793&view=rev Log: ZOOKEEPER-345 the CLIs should allow addAuth to be invoked. Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/src/c/src/cli.c hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=776793&r1=776792&r2=776793&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Wed May 20 18:08:28 2009 @@ -138,6 +138,7 @@ ZOOKEEPER-404. nightly build failed on hudson. (henry robinson and pat via mahadev) + ZOOKEEPER-345. the CLIs should allow addAuth to be invoked. (henry robinson via breed) NEW FEATURES: Modified: hadoop/zookeeper/trunk/src/c/src/cli.c URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/src/cli.c?rev=776793&r1=776792&r2=776793&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/c/src/cli.c (original) +++ hadoop/zookeeper/trunk/src/c/src/cli.c Wed May 20 18:08:28 2009 @@ -263,7 +263,7 @@ void processline(char *line) { int rc; - int async = (line[0] == 'a'); + int async = ((line[0] == 'a') && !(startsWith(line, "addauth "))); if (async) { line++; } @@ -277,6 +277,7 @@ fprintf(stderr, " exists \n"); fprintf(stderr, " myid\n"); fprintf(stderr, " verbose\n"); + fprintf(stderr, " addauth \n"); fprintf(stderr, " quit\n"); fprintf(stderr, "\n"); fprintf(stderr, " prefix the command with the character 'a' to run the command asynchronously.\n"); @@ -424,6 +425,15 @@ rc = zoo_aset(zh, "/od", val, sizeof(val)-1, -1, od_completion, 0); if (rc) fprintf(stderr, "od command failed: %d\n", rc); + } else if (startsWith(line, "addauth ")) { + line += 8; + char *ptr; + ptr = strchr(line, ' '); + if (ptr) { + *ptr = '\0'; + ptr++; + } + zoo_add_auth(zh, line, ptr, ptr ? strlen(ptr)-1 : 0, NULL, NULL); } } @@ -476,8 +486,8 @@ strncpy(p,cert,sizeof(p)-1); free(cert); } else { - fprintf(stderr,"Certificate for appid [%s] not found\n",appId); - strcpy(p,"dummy"); + fprintf(stderr,"Certificate for appid [%s] not found\n",appId); + strcpy(p,"dummy"); } #else strcpy(p, "dummy"); @@ -521,7 +531,7 @@ bufoff = 0; } } -#else +#else FD_ZERO(&rfds); FD_ZERO(&wfds); FD_ZERO(&efds); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java?rev=776793&r1=776792&r2=776793&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java Wed May 20 18:08:28 2009 @@ -76,6 +76,7 @@ commandMap.put("redo"," cmdno"); commandMap.put("printwatches", " on|off"); commandMap.put("quit",""); + commandMap.put("addauth", " scheme auth"); } static void usage() { @@ -719,6 +720,12 @@ } else { printWatches = args[1].equals("on"); } + } else if (cmd.equals("addauth") && args.length >=2 ) { + byte[] b = null; + if (args.length >= 3) + b = args[2].getBytes(); + + zk.addAuthInfo(args[1], b); } else { usage(); }