Merging from main development tree.

1 files changed, 1 insertions, 1 deletions

diff --git a/conf.c b/conf.c
index 0bd9cbc8..7538825d 100644
--- a/conf.c
+++ b/conf.c
@@ -94,7 +94,7 @@ conf_t *conf_load( int argc, char *argv[] )
 			}
 			conf->port = i;
 		}
-		else if( opt == 'p' )
+		else if( opt == 'P' )
 		{
 			g_free( conf->pidfile );
 			conf->pidfile = g_strdup( optarg );