diff options
| author | David Zeuthen <davidz@redhat.com> | 2011-05-31 11:33:14 -0400 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2011-05-31 11:33:14 -0400 |
| commit | c16341e940baa65f6f743596eba1d33aef7a8cdf (patch) | |
| tree | 717815e9cf528646a24cb6ca9af83a5db2a530a8 | |
| parent | fdba6fdf6c44a83f433697d90c79c21d9c5e72aa (diff) | |
Strip out API keys and disable services without API keys
This leaves us with only the Google provider.
Other providers can be added back in the future once TOS etc. for the
provider in question have been properly reviewed.
Signed-off-by: David Zeuthen <davidz@redhat.com>
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | src/daemon/goadaemon.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index b3002c0..f748181 100644 --- a/configure.ac +++ b/configure.ac @@ -89,61 +89,61 @@ if test "$enable_google" != "no"; then fi # Twitter -with_twitter_consumer_key=tlVEAXvkgqr0VUFyqVQ +with_twitter_consumer_key=not_set AC_ARG_WITH([twitter-consumer-key=KEY], [AS_HELP_STRING([--with-twitter-consumer-key], [Twitter OAuth 1.0 consumer key])], [], []) AC_DEFINE_UNQUOTED(GOA_TWITTER_CONSUMER_KEY, ["$with_twitter_consumer_key"], [Twitter OAuth 1.0 consumer key]) -with_twitter_consumer_secret=RN2FBARWy7scDmWFwfhIA6Qwf6kPYxZ0PIpVWzgpdU +with_twitter_consumer_secret=not_set AC_ARG_WITH([twitter-consumer-secret=SECRET], [AS_HELP_STRING([--with-twitter-consumer-secret], [Twitter OAuth 1.0 consumer secret])], [], []) AC_DEFINE_UNQUOTED(GOA_TWITTER_CONSUMER_SECRET, ["$with_twitter_consumer_secret"], [Twitter OAuth 1.0 consumer secret]) -AC_ARG_ENABLE([twitter], [AS_HELP_STRING([--enable-twitter], [Enable Twitter provider])], [], [enable_twitter=yes]) +AC_ARG_ENABLE([twitter], [AS_HELP_STRING([--enable-twitter], [Enable Twitter provider])], [], [enable_twitter=no]) if test "$enable_twitter" != "no"; then AC_DEFINE(GOA_TWITTER_ENABLED, 1, [Enable Twitter data provider]) fi # Yahoo -with_yahoo_consumer_key=dj0yJmk9VnBYMGpGRVFBUVl3JmQ9WVdrOWNWZDZiVTUwTldNbWNHbzlPVFF5TURrNE5UWXkmcz1jb25zdW1lcnNlY3JldCZ4PTQ0 +with_yahoo_consumer_key=not_set AC_ARG_WITH([yahoo-consumer-key=KEY], [AS_HELP_STRING([--with-yahoo-consumer-key], [Yahoo OAuth 1.0 consumer key])], [], []) AC_DEFINE_UNQUOTED(GOA_YAHOO_CONSUMER_KEY, ["$with_yahoo_consumer_key"], [Yahoo OAuth 1.0 consumer key]) -with_yahoo_consumer_secret=33dd9ebe9f5724deabe657eff1de7c3f151cf7eb +with_yahoo_consumer_secret=not_set AC_ARG_WITH([yahoo-consumer-secret=SECRET], [AS_HELP_STRING([--with-yahoo-consumer-secret], [Yahoo OAuth 1.0 consumer secret])], [], []) AC_DEFINE_UNQUOTED(GOA_YAHOO_CONSUMER_SECRET, ["$with_yahoo_consumer_secret"], [Yahoo OAuth 1.0 consumer secret]) -AC_ARG_ENABLE([yahoo], [AS_HELP_STRING([--enable-yahoo], [Enable Yahoo provider])], [], [enable_yahoo=yes]) +AC_ARG_ENABLE([yahoo], [AS_HELP_STRING([--enable-yahoo], [Enable Yahoo provider])], [], [enable_yahoo=no]) if test "$enable_yahoo" != "no"; then AC_DEFINE(GOA_YAHOO_ENABLED, 1, [Enable Yahoo data provider]) fi # Facebook -with_facebook_client_id=103995033022129 +with_facebook_client_id=not_set AC_ARG_WITH([facebook-client-id=ID], [AS_HELP_STRING([--with-facebook-client-id], [Facebook OAuth 2.0 client id])], [], []) AC_DEFINE_UNQUOTED(GOA_FACEBOOK_CLIENT_ID, ["$with_facebook_client_id"], [Facebook OAuth 2.0 client id]) -with_facebook_client_secret=c3a9f8d49188a6dd8b596df48a90b94a +with_facebook_client_secret=not_set AC_ARG_WITH([facebook-client-secret=SECRET], [AS_HELP_STRING([--with-facebook-client-secret], [Facebook OAuth 2.0 client secret])], [], []) AC_DEFINE_UNQUOTED(GOA_FACEBOOK_CLIENT_SECRET, ["$with_facebook_client_secret"], [Facebook OAuth 2.0 client secret]) -AC_ARG_ENABLE([facebook], [AS_HELP_STRING([--enable-facebook], [Enable Facebook provider])], [], [enable_facebook=yes]) +AC_ARG_ENABLE([facebook], [AS_HELP_STRING([--enable-facebook], [Enable Facebook provider])], [], [enable_facebook=no]) if test "$enable_facebook" != "no"; then AC_DEFINE(GOA_FACEBOOK_ENABLED, 1, [Enable Facebook data provider]) fi diff --git a/src/daemon/goadaemon.c b/src/daemon/goadaemon.c index c040687..b6f68cc 100644 --- a/src/daemon/goadaemon.c +++ b/src/daemon/goadaemon.c @@ -443,7 +443,7 @@ update_account_object (GoaDaemon *daemon, if (provider == NULL) { /* TODO: syslog */ - g_warning ("Unsupported account type %s for id %s (no provider)", type, goa_account_get_id (account)); + goa_warning ("Unsupported account type %s for identity %s (no provider)", type, identity); goto out; } |